From e8cd27dd8a68335658d7ca5363e9f2d7ef29adc6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 24 Sep 2016 23:56:33 +0200 Subject: [PATCH] linux_4_6: remove, not maintained anymore --- pkgs/os-specific/linux/kernel/linux-4.6.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 13 ------------- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.6.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix deleted file mode 100644 index 6bca1bfe718c..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.6.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.6.7"; - extraMeta.branch = "4.6"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "107acpq6jk48ng25jlyv905zslrrv77yxwr46mqbq5lxg8rdg7fh"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0dc200f68a7..ea2b7b0839ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11445,18 +11445,6 @@ in ]; }; - linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.cpu-cgroup-v2."4.6" - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11638,7 +11626,6 @@ in linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); - linuxPackages_4_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_6 linuxPackages_4_6); linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest!