Skip to content

Commit

Permalink
Remove iwlwifi kernelPackage and feature
Browse files Browse the repository at this point in the history
All of our kernels except the ancient 2.6.15 have iwlwifi built-in, and
nothing actually checks for features.iwlwifi any more. If there is a
real user out there using 2.6.15 that needs iwlwifi, I'll fix it and owe
them a beverage of their choice.

Signed-off-by: Shea Levy <shea@shealevy.com>
  • Loading branch information
shlevy committed Mar 25, 2013
1 parent 36e4fc3 commit a924b4e
Show file tree
Hide file tree
Showing 14 changed files with 3 additions and 66 deletions.
11 changes: 2 additions & 9 deletions doc/package-notes.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -32,15 +32,8 @@ extra options to be concatenated to the kernel configuration file
<varname>features</varname> specifying whether optional functionality <varname>features</varname> specifying whether optional functionality
is or isn’t enabled. This is used in NixOS to implement is or isn’t enabled. This is used in NixOS to implement
kernel-specific behaviour. For instance, if the kernel has the kernel-specific behaviour. For instance, if the kernel has the
<varname>iwlwifi</varname> feature (i.e. has built-in support for <varname>efiBootStub</varname> feature (i.e. the kernel is an EFI
Intel wireless chipsets), then NixOS doesn’t have to build the application), then NixOS be installed on efi machines.
external <varname>iwlwifi</varname> package:

<programlisting>
modulesTree = [kernel]
++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi
++ ...;
</programlisting>


</para> </para>


Expand Down
40 changes: 0 additions & 40 deletions pkgs/os-specific/linux/iwlwifi/default.nix

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/os-specific/linux/kernel/generic.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
configCross ? {} configCross ? {}


, # An attribute set whose attributes express the availability of , # An attribute set whose attributes express the availability of
# certain features in this kernel. E.g. `{iwlwifi = true;}' # certain features in this kernel. E.g. `{efiBootStub = true;}'
# indicates a kernel that provides Intel wireless support. Used in # indicates a kernel that provides Intel wireless support. Used in
# NixOS to implement kernel-specific behaviour. # NixOS to implement kernel-specific behaviour.
features ? {} features ? {}
Expand Down
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-2.6.32.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -207,8 +207,6 @@ import ./generic.nix (


config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;

features.iwlwifi = true;
} }


// removeAttrs args ["extraConfig"] // removeAttrs args ["extraConfig"]
Expand Down
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-2.6.35.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -214,8 +214,6 @@ import ./generic.nix (


config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;

features.iwlwifi = true;
} }


// removeAttrs args ["extraConfig"] // removeAttrs args ["extraConfig"]
Expand Down
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-3.0.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -237,8 +237,6 @@ import ./generic.nix (


config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;

features.iwlwifi = true;
} }


// removeAttrs args ["extraConfig"] // removeAttrs args ["extraConfig"]
Expand Down
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-3.2.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -246,8 +246,6 @@ import ./generic.nix (


config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;

features.iwlwifi = true;
} }


// removeAttrs args ["extraConfig"] // removeAttrs args ["extraConfig"]
Expand Down
1 change: 0 additions & 1 deletion pkgs/os-specific/linux/kernel/linux-3.4.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;


features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.netfilterRPFilter = true; features.netfilterRPFilter = true;
Expand Down
1 change: 0 additions & 1 deletion pkgs/os-specific/linux/kernel/linux-3.7.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;


features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true; features.canDisableNetfilterConntrackHelpers = true;
Expand Down
1 change: 0 additions & 1 deletion pkgs/os-specific/linux/kernel/linux-3.8.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;


features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true; features.canDisableNetfilterConntrackHelpers = true;
Expand Down
1 change: 0 additions & 1 deletion pkgs/os-specific/linux/kernel/linux-3.9.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;


features.iwlwifi = true;
features.efiBootStub = true; features.efiBootStub = true;
features.needsCifsUtils = true; features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true; features.canDisableNetfilterConntrackHelpers = true;
Expand Down
1 change: 0 additions & 1 deletion pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import ./generic.nix (
config = configWithPlatform stdenv.platform; config = configWithPlatform stdenv.platform;
configCross = configWithPlatform stdenv.cross.platform; configCross = configWithPlatform stdenv.cross.platform;


features.iwlwifi = true;
#features.efiBootStub = true; #features.efiBootStub = true;
#features.needsCifsUtils = true; #features.needsCifsUtils = true;
#features.canDisableNetfilterConntrackHelpers = true; #features.canDisableNetfilterConntrackHelpers = true;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5975,8 +5975,6 @@ let


iscsitarget = callPackage ../os-specific/linux/iscsitarget { }; iscsitarget = callPackage ../os-specific/linux/iscsitarget { };


iwlwifi = callPackage ../os-specific/linux/iwlwifi { };

iwlwifi4965ucode = iwlwifi4965ucode =
if builtins.compareVersions self.kernel.version "2.6.27" == 0 if builtins.compareVersions self.kernel.version "2.6.27" == 0
|| builtins.compareVersions self.kernel.version "2.6.27" == 1 || builtins.compareVersions self.kernel.version "2.6.27" == 1
Expand Down
1 change: 0 additions & 1 deletion pkgs/top-level/release-python.nix
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1092,7 +1092,6 @@ in
exmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; exmap = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
frandom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; frandom = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; iscsitarget = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
iwlwifi = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; klibc = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; kqemu = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ndiswrapper = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
Expand Down

0 comments on commit a924b4e

Please sign in to comment.