From b3f7d626c164ae591a067f78bfcbb06fc3a588b9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 24 Oct 2016 21:30:00 -0400 Subject: [PATCH] kernel: remove 4.7 --- pkgs/os-specific/linux/kernel/linux-4.7.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 15 --------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.7.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix deleted file mode 100644 index eda2dd26163..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.7.10"; - extraMeta.branch = "4.7"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p2r5d0jcrak9gxp0339g9z198x9laf09h08ck4jllhhaajrnicj"; - }; - - 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 3f1aaab0f29..5bab0bebbd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10858,20 +10858,6 @@ in ]; }; - linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.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.7" - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11060,7 +11046,6 @@ in linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); - linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7); linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8); # Don't forget to update linuxPackages_latest!