git.iko.soy/typeable/nixpkgs
on master help sign in
linux: remove 5.11
commite968368c0d76ea8917f901b28e65491020ca0e13 authorYurii Matsiuk <ymatsiuk@users.noreply.github.com> dateTue 8 Jun 2021, 16:22 (5 years ago) parent4b9a7a1
5 files changed+9−43
compare with master
unifiedsplit
pkgs/os-specific/linux/kernel/hardened/patches.json−6 pkgs/os-specific/linux/kernel/linux-5.11.nix−20 pkgs/os-specific/linux/kernel/linux-lqx.nix+4−4 pkgs/os-specific/linux/kernel/linux-zen.nix+4−4 pkgs/top-level/all-packages.nix+1−9
pkgs/os-specific/linux/kernel/hardened/patches.json−6
@@ -17,12 +17,6 @@
1717 "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix",
1818 "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch"
1919 },
20− "5.11": {
21− "extra": "-hardened1",
22− "name": "linux-hardened-5.11.22-hardened1.patch",
23− "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh",
24− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch"
25− },
2620 "5.12": {
2721 "extra": "-hardened1",
2822 "name": "linux-hardened-5.12.9-hardened1.patch",
pkgs/os-specific/linux/kernel/linux-5.11.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
2−
3−with lib;
4−
5−buildLinux (args // rec {
6− version = "5.11.22";
7−
8− # modDirVersion needs to be x.y.z, will automatically add .0 if needed
9− modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
10−
11− # branchVersion needs to be x.y
12− extraMeta.branch = versions.majorMinor version;
13−
14− src = fetchurl {
15− url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi";
17− };
18−
19− kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ];
20−} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-lqx.nix+4−4
@@ -1,7 +1,7 @@
11{ lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args:
22
33let
4− version = "5.11.21";
4+ version = "5.12.9";
55 suffix = "lqx1";
66in
77
@@ -14,13 +14,13 @@ buildLinux (args // {
1414 owner = "zen-kernel";
1515 repo = "zen-kernel";
1616 rev = "v${version}-${suffix}";
17− sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1";
17+ sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw=";
1818 };
1919
2020 extraMeta = {
21− branch = "5.10/master";
21+ branch = "5.12/master";
2222 maintainers = with lib.maintainers; [ atemu ];
2323 description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)";
2424 };
2525
26−} // (args.argsOverride or {}))
26+} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-zen.nix+4−4
@@ -1,7 +1,7 @@
11{ lib, fetchFromGitHub, buildLinux, ... } @ args:
22
33let
4− version = "5.11.16";
4+ version = "5.12.9";
55 suffix = "zen1";
66in
77
@@ -14,13 +14,13 @@ buildLinux (args // {
1414 owner = "zen-kernel";
1515 repo = "zen-kernel";
1616 rev = "v${version}-${suffix}";
17− sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv";
17+ sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ=";
1818 };
1919
2020 extraMeta = {
21− branch = "5.10/master";
21+ branch = "5.12/master";
2222 maintainers = with lib.maintainers; [ atemu andresilva ];
2323 description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads.";
2424 };
2525
26−} // (args.argsOverride or {}))
26+} // (args.argsOverride or { }))
pkgs/top-level/all-packages.nix+1−9
@@ -20557,13 +20557,6 @@ in
2055720557 ];
2055820558 };
2055920559
20560− linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix {
20561− kernelPatches = [
20562− kernelPatches.bridge_stp_helper
20563− kernelPatches.request_key_helper
20564− ];
20565− };
20566−
2056720560 linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
2056820561 kernelPatches = [
2056920562 kernelPatches.bridge_stp_helper
@@ -20875,7 +20868,6 @@ in
2087520868 linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
2087620869 linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
2087720870 linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
20878− linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11);
2087920871 linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
2088020872
2088120873 # When adding to the list above:
@@ -20909,7 +20901,7 @@ in
2090920901 # Hardened Linux
2091020902 hardenedLinuxPackagesFor = kernel': overrides:
2091120903 let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
20912− linux_latest_for_hardened = pkgs.linux_5_11;
20904+ linux_latest_for_hardened = pkgs.linux_5_12;
2091320905 kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
2091420906 in linuxPackagesFor (kernel.override {
2091520907 structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {