diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-02 01:01:16 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-22 12:25:32 +0200 |
commit | 069b4a8a57f50488c5c03b137d886626821d80f8 (patch) | |
tree | a32bfc18ab55fabde9886234768e73f077fb3e21 /pkgs/os-specific/linux | |
parent | bb5647ea0f48b666a65b9018f1bf775623293a77 (diff) | |
download | nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.tar nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.tar.gz nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.tar.bz2 nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.tar.lz nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.tar.xz nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.tar.zst nixlib-069b4a8a57f50488c5c03b137d886626821d80f8.zip |
Remove Linux 3.2 and 3.4
These are not supported by systemd so no reason to keep them around. (cherry picked from commit ee10e165dcc23f7b1855072f5a1f208dcdeead93) Conflicts: pkgs/os-specific/linux/kernel/linux-3.4.nix
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.2.nix | 27 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.4.nix | 27 |
2 files changed, 0 insertions, 54 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix deleted file mode 100644 index 2fc240f6196d..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.2.69"; - extraMeta.branch = "3.2"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0fs7aj3vn51dlx7yfgkx05qpki2msh6j2irwajd9bw0l26cbycd3"; - }; - - # We don't provide these patches if grsecurity is enabled, because - # the grsec 3.2 -stable patchset already includes them. - kernelPatches = args.kernelPatches ++ ( - stdenv.lib.optionals (!(args.features.grsecurity or false)) - [ { name = "0001-AppArmor-compatibility-patch-for-v5-network-controll"; - patch = ./apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch; - } - { name = "0002-AppArmor-compatibility-patch-for-v5-interface"; - patch = ./apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch; - } - { name = "0003-AppArmor-Allow-dfa-backward-compatibility-with-broke"; - patch = ./apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch; - }]); - - features.iwlwifi = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix deleted file mode 100644 index a0ba7f46c687..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.4.108"; - extraMeta.branch = "3.4"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0xdycfbn2j398n1763zkhiv08xsya52acic1zign4s315b45pijm"; - }; - - kernelPatches = args.kernelPatches ++ - [ { name = "0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file"; - patch = ./apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch; - } - { name = "0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules"; - patch = ./apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch; - } - { name = "0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou"; - patch = ./apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch; - }]; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) |