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

Merge branch 'staging/moby-6.1.0-rc7'

Browse Source
This commit is contained in:
colin
2022-12-03 09:05:13 +00:00
parent 63c92a44ed e8a7a1dc75
commit 977a80d59e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/linux-megous/default.nix
View File

@@ -2,11 +2,15 @@
with lib; with lib;
buildLinux (args // rec { let
version = "6.0.2"; base = "6.1.0";
# set to empty if not a release candidate
rc = "-rc7";
in buildLinux (args // rec {
version = base + rc;
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) + rc else modDirVersionArg;
# branchVersion needs to be x.y # branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version; extraMeta.branch = versions.majorMinor version;
@@ -14,8 +18,7 @@ buildLinux (args // rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "megous"; owner = "megous";
repo = "linux"; repo = "linux";
# branch: orange-pi-6.0 rev = "orange-pi-6.1-20221128-1027";
rev = "2683672a2052ffda995bb987fa62a1abe8424ef4"; hash = "sha256-kEujs4v5rPHPYy4YLyEWHa1Bu0sxoXLgSvmOH9QPWos=";
hash = "sha256-hL/SbLgaTk/CqFLFrAK/OV9/OS20O42zJvSScsvWBQk=";
}; };
} // (args.argsOverride or { })) } // (args.argsOverride or { }))