From 504ea7662c6f4d7e4e90a48926bbc6276b311be3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 1 Nov 2013 10:53:07 -0400 Subject: [PATCH] Remove EOL'd kernels Signed-off-by: Shea Levy --- pkgs/os-specific/linux/kernel/linux-3.0.nix | 12 ----------- pkgs/os-specific/linux/kernel/linux-3.9.nix | 16 --------------- pkgs/os-specific/linux/kernel/patches.nix | 14 ------------- pkgs/top-level/all-packages.nix | 22 --------------------- 4 files changed, 64 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.0.nix delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.9.nix diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix deleted file mode 100644 index 30b70035dfac..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.0.99"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1p31gq9kzwfks980y6rb2mjyagj8lrh6y156a550v7mk0bd4fzdi"; - }; - - features.iwlwifi = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix deleted file mode 100644 index 51bcf35b3fe8..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.9.11"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0d5j7kg1ifzwipicbi4g26plzbzn1rlvgj1hs4zip6sxj8ifbffl"; - }; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 613f40c6fc96..6c812646209c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -68,20 +68,6 @@ rec { features.secPermPatch = true; }; - aufs3_0 = rec { - name = "aufs3.0"; - version = "3.0.20121210"; - utilRev = "91af15f977d12e02165759620005f6ce1a4d7602"; - utilHash = "dda4df89828dcf0e4012d88b4aa3eda8c30af69d6530ff5fedc2411de872c996"; - patch = makeAufs3StandalonePatch { - inherit version; - rev = "0627c706d69778f5c74be982f28c746153b8cdf7"; - sha256 = "7008ff64f5adc2b3a30fcbb090bcbfaac61b778af38493b6144fc7d768a6514d"; - }; - features.aufsBase = true; - features.aufs3 = true; - }; - aufs3_2 = rec { name = "aufs3.2"; version = "3.2.20121210"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39dbeae6df44..9749db65557f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6594,14 +6594,6 @@ let kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; - linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ kernelPatches.sec_perm_2_6_24 - # kernelPatches.aufs3_0 - ]; - }; - linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) { inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = @@ -6669,18 +6661,6 @@ let inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; }; - linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { - inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; - kernelPatches = - [ - kernelPatches.sec_perm_2_6_24 - ] ++ lib.optionals (platform.kernelArch == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) { inherit fetchurl stdenv perl mktemp bc kmod ubootChooser; kernelPatches = @@ -6827,7 +6807,6 @@ let }; # Build the kernel modules for the some of the kernels. - linuxPackages_3_0 = recurseIntoAttrs (linuxPackagesFor linux_3_0 linuxPackages_3_0); linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); linuxPackages_3_2_apparmor = linuxPackagesFor pkgs.linux_3_2_apparmor linuxPackages_3_2_apparmor; linuxPackages_3_2_grsecurity = linuxPackagesFor pkgs.linux_3_2_grsecurity linuxPackages_3_2_grsecurity; @@ -6835,7 +6814,6 @@ let linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_4_apparmor = linuxPackagesFor pkgs.linux_3_4_apparmor linuxPackages_3_4_apparmor; linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); - linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); linuxPackages_3_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_11 linuxPackages_3_11); linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);