From 69a277e2cc9286d966489823b0940d8d4a6bc637 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 13 Feb 2015 14:27:47 -0800
Subject: [PATCH] iwlegacy: Remove since it is already in
 linux-firmware-nonfree

---
 nixos/modules/hardware/all-firmware.nix       |  1 -
 .../linux/firmware/iwlegacy/default.nix       | 47 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 50 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/firmware/iwlegacy/default.nix

diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 17aa29425956..e4bdeb55cadc 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -24,7 +24,6 @@ with lib;
   config = mkIf config.hardware.enableAllFirmware {
     hardware.firmware = [
       "${pkgs.firmwareLinuxNonfree}/lib/firmware"
-      "${pkgs.iwlegacy}/lib/firmware"
     ];
   };
 
diff --git a/pkgs/os-specific/linux/firmware/iwlegacy/default.nix b/pkgs/os-specific/linux/firmware/iwlegacy/default.nix
deleted file mode 100644
index 99524e4504e9..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlegacy/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  packages = [
-    # Kernel 2.6.28+
-    { name = "4965-ucode-228.61.2.24"; sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m"; }
-
-    # Kernel 2.6.29+
-    { name = "3945-ucode-15.32.2.9"; sha256 = "0baf07lblwsq841zdcj9hicf11jiq06sz041qcybc6l8yyhhcqjk"; }
-  ];
-
-  fetchPackage =
-    { name, sha256 }: fetchurl {
-      name = "iwlwifi-${name}.tgz";
-      url = "https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-${name}.tgz";
-      inherit sha256;
-    };
-
-  srcs = map fetchPackage packages;
-
-in stdenv.mkDerivation {
-  name = "iwlegacy";
-  inherit srcs;
-
-  unpackPhase = ''
-    mkdir -p ./firmware
-  '';
-
-  buildPhase = ''
-    for src in $srcs; do
-      tar zxf $src
-    done
-  '';
-
-  installPhase = ''
-    mkdir -p $out/lib/firmware
-    cp -r iwlwifi-*/*.ucode "$out/lib/firmware/"
-  '';
-
-  meta = {
-    description = "Binary firmware collection from intel";
-    homepage = http://wireless.kernel.org/en/users/Drivers/iwlwifi;
-    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5d7e12450fa..2e1f2be94c33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8583,8 +8583,6 @@ let
 
   iw = callPackage ../os-specific/linux/iw { };
 
-  iwlegacy = callPackage ../os-specific/linux/firmware/iwlegacy { };
-
   jfbview = callPackage ../os-specific/linux/jfbview { };
 
   jujuutils = callPackage ../os-specific/linux/jujuutils { };