diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-09-23 19:56:31 +0300 |
---|---|---|
committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-09-23 19:56:31 +0300 |
commit | c405f2226627f083da705f0744ab6247d0391f34 (patch) | |
tree | 75c84847debc9294f4e86adbe5760f090d6ebe7e | |
parent | d9b4d81a39d70fc481e86bcfa3362d32a3578b44 (diff) | |
parent | efa5b92bfca97a23724faceeba06e6fdcfceeabe (diff) |
Merge pull request #10016 from cleverca22/master
open-iscsi: 2.0-871 -> 2.0-873
-rw-r--r-- | pkgs/os-specific/linux/open-iscsi/default.nix | 12 | ||||
-rw-r--r-- | pkgs/os-specific/linux/open-iscsi/kernel.patch | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 6 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 88ab08e6c3d26..c4e39e45cade0 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/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; }; } diff --git a/pkgs/os-specific/linux/open-iscsi/kernel.patch b/pkgs/os-specific/linux/open-iscsi/kernel.patch deleted file mode 100644 index 48dfa195400f3..0000000000000 --- a/pkgs/os-specific/linux/open-iscsi/kernel.patch +++ /dev/null @@ -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: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e53c988f888c..be92929e65877 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |