From e968368c0d76ea8917f901b28e65491020ca0e13 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Tue, 8 Jun 2021 16:22:28 +0200 Subject: [PATCH] linux: remove 5.11 --- .../linux/kernel/hardened/patches.json | 6 ------ pkgs/os-specific/linux/kernel/linux-5.11.nix | 20 ------------------- pkgs/os-specific/linux/kernel/linux-lqx.nix | 8 ++++---- pkgs/os-specific/linux/kernel/linux-zen.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 10 +--------- 5 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.11.nix diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 028bdbda3f2..bb668a6e904 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch" }, - "5.11": { - "extra": "-hardened1", - "name": "linux-hardened-5.11.22-hardened1.patch", - "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" - }, "5.12": { "extra": "-hardened1", "name": "linux-hardened-5.12.9-hardened1.patch", diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix deleted file mode 100644 index e6a8aef650b..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.11.22"; - - # 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; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 4bc5cee4444..609dc494c69 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.21"; + version = "5.12.9"; suffix = "lqx1"; in @@ -14,13 +14,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1"; + sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw="; }; extraMeta = { - branch = "5.10/master"; + branch = "5.12/master"; maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; -} // (args.argsOverride or {})) +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index b28400819d5..47e72a61c18 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.16"; + version = "5.12.9"; suffix = "zen1"; in @@ -14,13 +14,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv"; + sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ="; }; extraMeta = { - branch = "5.10/master"; + branch = "5.12/master"; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; -} // (args.argsOverride or {})) +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40335b63e39..9f9448d50c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20557,13 +20557,6 @@ in ]; }; - linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20875,7 +20868,6 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); # When adding to the list above: @@ -20909,7 +20901,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_11; + linux_latest_for_hardened = pkgs.linux_5_12; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {