Merge pull request #10016 from cleverca22/master

open-iscsi: 2.0-871 -> 2.0-873

pkgs/os-specific/linux/open-iscsi/default.nix

@@ -1,27 +1,23 @@
-{ stdenv, fetchurl, kernel}:
+{ stdenv, fetchurl }:
 let
-  pname = "open-iscsi-2.0-871";
+  pname = "open-iscsi-2.0-873";
 in stdenv.mkDerivation {
-  name = "${pname}-${kernel.version}";
+  name = "${pname}";
   
   src = fetchurl {
     url = "http://www.open-iscsi.org/bits/${pname}.tar.gz";
-    sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
+    sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
   };
   
-  KSRC = "${kernel.dev}/lib/modules/*/build";
   DESTDIR = "$(out)";
   
   preConfigure = ''
     sed -i 's|/usr/|/|' Makefile
   '';
   
-  patches = [./kernel.patch];
-  
   meta = {
     description = "A high performance, transport independent, multi-platform implementation of RFC3720";
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://www.open-iscsi.org;
-    broken = true;
   };
 }

pkgs/os-specific/linux/open-iscsi/kernel.patch

@@ -1,12 +0,0 @@
-*** open-iscsi-2.0-871/kernel/Makefile	2009-07-11 05:55:58.000000000 +0200
---- open-iscsi-2.0-871-new/kernel/Makefile	2010-08-30 11:37:56.000000000 +0200
-***************
-*** 101,106 ****
---- 101,107 ----
-  linux_2_6_29: $(unpatch_code)
-  
-  linux_2_6_30: $(unpatch_code)
-+ linux_2_6_32: $(unpatch_code)
-  
-  
-  do_unpatch_code:

pkgs/top-level/all-packages.nix

@@ -9567,6 +9567,8 @@ let
 
   linuxConsoleTools = callPackage ../os-specific/linux/consoletools { };
 
+  openiscsi = callPackage ../os-specific/linux/open-iscsi { };
+
   # -- Linux kernel expressions ------------------------------------------------
 
   linuxHeaders = linuxHeaders_3_12;
@@ -9747,8 +9749,6 @@ let
 
     openafsClient = callPackage ../servers/openafs-client { };
 
-    openiscsi = callPackage ../os-specific/linux/open-iscsi { };
-
     wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };
 
     kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };