From 8079b1a3c870a292c25a4c8be424e0a8b85db938 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Sep 2021 23:06:43 +0200 Subject: [PATCH] linux_5_13: drop 5.13.19 was the last 5.13 release and the version is now EOL[1]. [1] https://lwn.net/Articles/869747/ (cherry picked from commit 01eb8ec98a52c1e7317fd62f5bc58db30951e716) --- nixos/tests/kernel-generic.nix | 1 - .../linux/kernel/hardened/patches.json | 6 ------ pkgs/os-specific/linux/kernel/linux-5.13.nix | 20 ------------------- pkgs/top-level/all-packages.nix | 8 -------- 4 files changed, 35 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-5.13.nix diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 2bd0c50e61c..8ae7ebf0a7b 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,7 +31,6 @@ with pkgs; { linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_13 = makeKernelTest "5.13" linuxPackages_5_13; linux_5_14 = makeKernelTest "5.14" linuxPackages_5_14; linux_testing = makeKernelTest "testing" linuxPackages_testing; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 36c7b557818..9b9ffbe3052 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -17,12 +17,6 @@ "sha256": "11cn72lzgc6vcbx4xbdvfxrfwy3hfn7sqjxf5laqw9jdhacnlhvn", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.68-hardened1/linux-hardened-5.10.68-hardened1.patch" }, - "5.13": { - "extra": "-hardened1", - "name": "linux-hardened-5.13.19-hardened1.patch", - "sha256": "1cj99y2xn7l89lf4mn7arp0r98r4nmvql3ffjpngzv8hsf79xgg7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.19-hardened1/linux-hardened-5.13.19-hardened1.patch" - }, "5.14": { "extra": "-hardened1", "name": "linux-hardened-5.14.7-hardened1.patch", diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix deleted file mode 100644 index 04526dad25d..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.13.19"; - - # 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 = "0yxbcd1k4l4cmdn0hzcck4s0yvhvq9fpwp120dv9cz4i9rrfqxz8"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; -} // (args.argsOverride or { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 941dbd125f4..da0954d5fe2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20457,13 +20457,6 @@ in ]; }; - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20777,7 +20770,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_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); # When adding to the list above: