diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix
deleted file mode 100644
index abc6bf08dac..00000000000
--- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "ipw2100-fw-1.3";
-  
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2100-firmware/ipw2100-fw-1.3.tgz/46aa75bcda1a00efa841f9707bbbd113/ipw2100-fw-1.3.tgz;
-    sha256 = "18m7wgd062qwfdr6y0kjrvf1715wjcjn4yml2sk29ls8br2pq471";
-  };
-
-  unpackPhase = "tar xvzf $src";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = "mkdir -p $out; cp ipw* LICENSE $out";
-  
-  meta = {
-    # "... you may transfer a copy of the Software ... provided such
-    # recipient agrees to be fully bound by the terms hereof."
-    description = "Firmware for the Intel 2100BG wireless card (requires acceptance of license, see http://ipw2100.sourceforge.net/firmware.php?fid=2)";
-    homepage = http://ipw2100.sourceforge.net/firmware.php;
-    license = http://ipw2100.sourceforge.net/firmware.php?fid=2;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix
deleted file mode 100644
index 5c4989b878a..00000000000
--- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "ipw2200-fw-3.1";
-  
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-3.1.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-3.1.tgz;
-    sha256 = "1gaqc8d827d6ji7zhhkpbr4fzznqpar68gzqbzak1h4cq48qr0f6";
-  };
-  
-  buildPhase = "true";
-
-  # Installation copies the firmware AND the license.  The license
-  # says: "Your rights to redistribute the Software shall be
-  # contingent upon your installation of this Agreement in its
-  # entirety in the same directory as the Software."
-  installPhase = "mkdir -p $out; cp * $out";
-  
-  meta = {
-    # "... you may transfer a copy of the Software ... provided such
-    # recipient agrees to be fully bound by the terms hereof."
-    description = "Firmware for the Intel 2200BG wireless card (requires acceptance of license, see http://ipw2200.sourceforge.net/firmware.php?fid=8";
-    homepage = http://ipw2200.sourceforge.net/firmware.php;
-    license = http://ipw2200.sourceforge.net/firmware.php?fid=8;
-    # See also http://ipw2100.sourceforge.net/firmware_faq.php
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
deleted file mode 100644
index 8acb75c3ed6..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-1000-ucode-128.50.3.1";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "7e81ddad18acec19364c9df22496e8afae99a2e1490b2b178e420b52d443728d";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 1000 wireless card";
-
-    longDescription = ''
-      This package provides version 3 of the Intel wireless card
-      firmware, for Linux up to 2.6.26.  It contains the
-      `iwlwifi-1000-3.ucode' file, which is loaded by the `iwlagn'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix
deleted file mode 100644
index bc9c8efe063..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-2030-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-2030-ucode-18.168.6.1";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "0b69jpb46fk63ybyyb8lbh99j1d29ayp8fl98l18iqy3q7mx4ry8";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    description = "Firmware for the Intel 2030 Series wireless card";
-
-    longDescription = ''
-      This package provides the Intel 2030 Series wireless card
-      firmware. It contains the `iwlwifi-2030-6.ucode' file.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
deleted file mode 100644
index 77756e771ae..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-3945-ucode-15.32.2.9";
-  
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/iwl3945-firmware/iwlwifi-3945-ucode-15.32.2.9.tgz/d99a75ab1305d1532a09471b2f9a547a/iwlwifi-3945-ucode-15.32.2.9.tgz;
-    sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = "mkdir -p $out; chmod -x *; cp * $out";
-  
-  meta = {
-    description = "Firmware for the Intel 3945ABG wireless card";
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
deleted file mode 100644
index 3e15374c65f..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-4965-ucode-228.61.2.24";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=iwlwifi-4965-ucode-228.61.2.24.tgz";
-    name = "iwlwifi-4965-ucode-228.61.2.24.tgz";
-    sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 4965ABG wireless card, for Linux 2.6.27+";
-
-    longDescription = ''
-      This package provides version 2 of the Intel wireless card
-      firmware, for Linux 2.6.27 and later.  It contains the
-      `iwlwifi-4965-2.ucode' file, which is loaded by the `iwlagn'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
deleted file mode 100644
index 8805f1393fb..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-5000-ucode-8.83.5.1-1";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-5000-ucode-8.83.5.1-1.tgz";
-    name = "iwlwifi-5000-ucode-8.83.5.1-1.tgz";
-    sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 5000 wireless card";
-
-    longDescription = ''
-      This package provides version 5 of the Intel wireless card
-      firmware. It contains the `iwlwifi-5000-5.ucode' file.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
deleted file mode 100644
index dca427cbff5..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-5150-ucode-8.24.2.2";
-  
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "d253e6ff6624639aded67c82df98b2bc4a66eb66400848d5614921d513540cf9";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 5150 wireless card";
-
-    longDescription = ''
-      This package provides version 1 of the Intel wireless card
-      firmware.  It contains the `iwlwifi-5150-2.ucode' file.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
deleted file mode 100644
index 2e88f1bba74..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-6000-ucode-9.221.4.1";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "7f04623231663dc4ee63df32fd890bfa9514dce1fab9dc7a25fda90350da836b";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    description = "Firmware for the Intel 6000 Series wireless card";
-
-    longDescription = ''
-      This package provides the Intel 6000 Series wireless card
-      firmware. It contains the `iwlwifi-6000-4.ucode' file.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
deleted file mode 100644
index ef259b70975..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-6000g2a-ucode-18.168.6.1";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "a7f2615756addafbf3e6912cb0265f9650b2807d1ccdf54b620735772725bbe9";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-    description = "Firmware for the Intel 6000 Series Gen2 wireless card";
-
-    longDescription = ''
-      This package provides the Intel 6000 Series wireless card
-      firmware. It contains the `iwlwifi-6000g2a-5.ucode' file.
-    '';
-  };
-}
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
deleted file mode 100644
index 0fee3acd0a3..00000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-6000g2b-ucode-17.168.5.2";
-
-  src = fetchurl {
-    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "5e4afdf070bfef549e50e62187f22dc2e40f5d9fe8b9a77561f8f3efb0d1d052";
-  };
-
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-  '';
-
-  meta = {
-    description = "Firmware for the Intel 6000 Series Gen2 wireless card";
-
-    longDescription = ''
-      This package provides the Intel 6000 Series wireless card
-      firmware. It contains the `iwlwifi-6000g2b-4.ucode' file.
-    '';
-
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d60275eb055..d09c4810ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6319,30 +6319,8 @@ let
 
   iptables = callPackage ../os-specific/linux/iptables { };
 
-  ipw2100fw = callPackage ../os-specific/linux/firmware/ipw2100 { };
-
-  ipw2200fw = callPackage ../os-specific/linux/firmware/ipw2200 { };
-
   iw = callPackage ../os-specific/linux/iw { };
 
-  iwlwifi1000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-1000-ucode { };
-
-  iwlwifi2030ucode = callPackage ../os-specific/linux/firmware/iwlwifi-2030-ucode { };
-
-  iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { };
-
-  iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { };
-
-  iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };
-
-  iwlwifi5150ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5150-ucode { };
-
-  iwlwifi6000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000-ucode { };
-
-  iwlwifi6000g2aucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2a-ucode { };
-
-  iwlwifi6000g2bucode = callPackage ../os-specific/linux/firmware/iwlwifi-6000g2b-ucode { };
-
   jujuutils = callPackage ../os-specific/linux/jujuutils { };
 
   kbd = callPackage ../os-specific/linux/kbd { };
@@ -6514,8 +6492,6 @@ let
 
     iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
 
-    iwlwifi4965ucode = iwlwifi4965ucodeV2;
-
     lttngModules = callPackage ../os-specific/linux/lttng-modules { };
 
     atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };