about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2018-12-01 11:16:25 -0500
committerTim Steinbach <tim@nequissimus.com>2018-12-01 11:20:38 -0500
commitff4bf6067e6571006df3c258f6cf46adb3ddf0d5 (patch)
tree2203307b3d8a8f969f17f8e933ca9639fb8f1cd1
parent813e74a2bf6cf445ee43224733692d219440fc70 (diff)
downloadnixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.tar
nixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.tar.gz
nixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.tar.bz2
nixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.tar.lz
nixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.tar.xz
nixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.tar.zst
nixlib-ff4bf6067e6571006df3c258f6cf46adb3ddf0d5.zip
kernel: Remove 4.18.x
4.18 series is EOL
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.18.nix18
-rw-r--r--pkgs/top-level/all-packages.nix11
2 files changed, 0 insertions, 29 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.18.nix b/pkgs/os-specific/linux/kernel/linux-4.18.nix
deleted file mode 100644
index fa9338fd800c..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
-  version = "4.18.20";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0lzn2w8zagqk3sp6jsp155xggm1c277xjh8m0nvddvdp1yg33b38";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21ab50f0ddf..cc18e0a06111 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14395,16 +14395,6 @@ with pkgs;
       ];
   };
 
-  linux_4_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-      ];
-  };
-
   linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -14600,7 +14590,6 @@ with pkgs;
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
-  linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18);
   linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
   # Don't forget to update linuxPackages_latest!