From e1a7be4294f2bac112fa918a2cbf1dd5f0956c6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 1 Aug 2013 00:02:00 +0200
Subject: [PATCH] iwlwifi4965ucodeV1: Remove

This is verrrry obsolete.
---
 .../firmware/iwlwifi-4965-ucode/default.nix   | 36 -------------------
 pkgs/top-level/all-packages.nix               |  8 +----
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix

diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
deleted file mode 100644
index 266c7795d230..000000000000
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation rec {
-  name = "iwlwifi-4965-ucode-228.57.1.21";
-  
-  src = fetchurl {
-    url = "wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=${name}.tgz";
-    name = "${name}.tgz";
-    sha256 = "1rry0kpzszxk60h5gb94advzi009010xb332iyvfpaiwbj6aiyas";
-  };
-  
-  buildPhase = "true";
-
-  installPhase = ''
-    mkdir -p "$out"
-    chmod -x *
-    cp * "$out"
-
-    # The driver expects the `-1' in the file name.
-    cd "$out"
-    ln -s iwlwifi-4965.ucode iwlwifi-4965-1.ucode
-  '';
-  
-  meta = {
-    description = "Firmware for the Intel 4965ABG wireless card";
-
-    longDescription = ''
-      This package provides version 2 of the Intel wireless card
-      firmware, for Linux up to 2.6.26.  It contains the
-      `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965'
-      driver found in recent kernels.
-    '';
-
-    homepage = http://intellinuxwireless.org/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e599a83a118..f3ced7dbc397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6313,8 +6313,6 @@ let
 
   iwlwifi3945ucode = callPackage ../os-specific/linux/firmware/iwlwifi-3945-ucode { };
 
-  iwlwifi4965ucodeV1 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode { };
-
   iwlwifi4965ucodeV2 = callPackage ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix { };
 
   iwlwifi5000ucode = callPackage ../os-specific/linux/firmware/iwlwifi-5000-ucode { };
@@ -6510,11 +6508,7 @@ let
 
     iwlwifi = callPackage ../os-specific/linux/iwlwifi { };
 
-    iwlwifi4965ucode =
-      if builtins.compareVersions self.kernel.version "2.6.27" == 0
-         || builtins.compareVersions self.kernel.version "2.6.27" == 1
-      then iwlwifi4965ucodeV2
-      else iwlwifi4965ucodeV1;
+    iwlwifi4965ucode = iwlwifi4965ucodeV2;
 
     atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };