From f89d6d92b7b4b79015836f12c5a114f53fa4eccb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 5 Sep 2018 21:02:09 -0400 Subject: linux: Remove 4.17 --- pkgs/os-specific/linux/kernel/linux-4.17.nix | 18 ------------------ pkgs/top-level/all-packages.nix | 11 ----------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.17.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix deleted file mode 100644 index 5c13f366221e..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.17.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "4.17.19"; - - # 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 = "05wz76qq70bfhfwd1zwzfmzq4rlgz40jpi9plb31njx1y7vkx6xs"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3cb6069caf8..26409db6d01d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14003,16 +14003,6 @@ with pkgs; ]; }; - linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.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_18 = callPackage ../os-specific/linux/kernel/linux-4.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -14235,7 +14225,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_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17); linuxPackages_4_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_18); # Don't forget to update linuxPackages_latest! -- cgit 1.4.1