linux-megous: fix eval error from aliased kernelPatches

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

View File

@ -2,44 +2,49 @@
, buildLinux , buildLinux
, buildPackages , buildPackages
, fetchFromGitHub , fetchFromGitHub
, kernelPatches
, modDirVersionArg ? null , modDirVersionArg ? null
, nixosTests , nixosTests
, perl , perl
, pkgs
, ... , ...
} @ args: } @ args:
with lib; with lib;
let let
kernelPatches' = kernelPatches;
base = "6.2.0"; base = "6.2.0";
# set to empty if not a release candidate # set to empty if not a release candidate
rc = "-rc5"; rc = "-rc5";
in buildLinux (args // rec { # `pkgs.kernelPatches` is a set of common patches
version = base + rc; # while `kernelPatches` callarg is a list.
# weird idiom, means we have to access pkgs.kernelPatches to access the actual patch directory:
# modDirVersion needs to be x.y.z, will automatically add .0 if needed extraKernelPatches = [
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) + rc else modDirVersionArg; pkgs.kernelPatches.bridge_stp_helper
pkgs.kernelPatches.request_key_helper
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
kernelPatches = [
kernelPatches'.bridge_stp_helper
kernelPatches'.request_key_helper
]; ];
overridenArgs = args // rec {
version = base + rc;
src = fetchFromGitHub { # modDirVersion needs to be x.y.z, will automatically add .0 if needed
# HOW TO UPDATE: modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) + rc else modDirVersionArg;
# - `git fetch` from megous' github.
# - there should be some new tag, like `orange-pi-6.1-blah`. use that. # branchVersion needs to be x.y
# - megi publishes release notes as the most recent commit on any stable branch, so just `git log`. extraMeta.branch = versions.majorMinor version;
# - orange-pi is listed as the "main integration branch".
# - specific branches like `pp` (pinephone) are dev branches, and probably less stable. src = fetchFromGitHub {
owner = "megous"; # HOW TO UPDATE:
repo = "linux"; # - `git fetch` from megous' github.
rev = "orange-pi-6.2-20230122-1624"; # - there should be some new tag, like `orange-pi-6.1-blah`. use that.
hash = "sha256-Yma9LwlMEnP0QkUZpEl+UkTGvOWOMANBoDsmcTrPb1s="; # - megi publishes release notes as the most recent commit on any stable branch, so just `git log`.
# - orange-pi is listed as the "main integration branch".
# - specific branches like `pp` (pinephone) are dev branches, and probably less stable.
owner = "megous";
repo = "linux";
rev = "orange-pi-6.2-20230122-1624";
hash = "sha256-Yma9LwlMEnP0QkUZpEl+UkTGvOWOMANBoDsmcTrPb1s=";
};
} // (args.argsOverride or { });
finalArgs = overridenArgs // {
kernelPatches = overridenArgs.kernelPatches or [] ++ extraKernelPatches;
}; };
} // (args.argsOverride or { })) in buildLinux finalArgs