colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

linux-megous: fix eval error from aliased kernelPatches

Browse Source 
have not completed a redeploy, so unsure if this has precisely the same
meaning as it used to.
This commit is contained in:
Colin 2023-05-03 10:19:40 +00:00
parent 13ee861b0d
commit 1aed894d2e
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/additional/linux-megous/default.nix
View File

@ -2,21 +2,27 @@
, buildLinux
, buildPackages
, fetchFromGitHub
, kernelPatches
, modDirVersionArg ? null
, nixosTests
, perl
, pkgs
, ...
} @ args:
with lib;
let
kernelPatches' = kernelPatches;
base = "6.2.0";
# set to empty if not a release candidate
rc = "-rc5";
in buildLinux (args // rec {
# `pkgs.kernelPatches` is a set of common patches
# while `kernelPatches` callarg is a list.
# weird idiom, means we have to access pkgs.kernelPatches to access the actual patch directory:
extraKernelPatches = [
pkgs.kernelPatches.bridge_stp_helper
pkgs.kernelPatches.request_key_helper
];
overridenArgs = args // rec {
version = base + rc;
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
@ -25,11 +31,6 @@ in buildLinux (args // rec {
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
kernelPatches = [
kernelPatches'.bridge_stp_helper
kernelPatches'.request_key_helper
];
src = fetchFromGitHub {
# HOW TO UPDATE:
# - `git fetch` from megous' github.
@ -42,4 +43,8 @@ in buildLinux (args // rec {
rev = "orange-pi-6.2-20230122-1624";
hash = "sha256-Yma9LwlMEnP0QkUZpEl+UkTGvOWOMANBoDsmcTrPb1s=";
};
} // (args.argsOverride or { }))
} // (args.argsOverride or { });
finalArgs = overridenArgs // {
kernelPatches = overridenArgs.kernelPatches or [] ++ extraKernelPatches;
};
in buildLinux finalArgs