Merge pull request #15060 from clefru/iscsi-on-master

iscsiadm can't load modules, so let's update open-iscsi and patch it.

3 files changed, 41 insertions, 13 deletions

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index d004328a10b..96ff1e52cdd 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchurl, nukeReferences }:
-let
-  pname = "open-iscsi-2.0-873";
-in stdenv.mkDerivation {
-  name = pname;
+{ stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
+stdenv.mkDerivation rec {
+  name = "open-iscsi-${version}";
+  version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
   outputs = [ "out" "iscsistart" ];
 
-  buildInputs = [ nukeReferences ];
+  buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
   
-  src = fetchurl {
-    urls = [
-      "http://www.open-iscsi.org/bits/${pname}.tar.gz"
-      "http://pkgs.fedoraproject.org/repo/pkgs/iscsi-initiator-utils/${pname}.tar.gz/8b8316d7c9469149a6cc6234478347f7/${pname}.tar.gz"
-    ];
-    sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
+  src = fetchFromGitHub {
+    owner = "open-iscsi";
+    repo = "open-iscsi";
+    rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9";
+    sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8";
   };
   
   DESTDIR = "$(out)";
   
+  NIX_LDFLAGS = "-lkmod";
+  NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
+
   preConfigure = ''
     sed -i 's|/usr/|/|' Makefile
   '';
@@ -30,7 +31,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "A high performance, transport independent, multi-platform implementation of RFC3720";
     license = licenses.gpl2Plus;
-    homepage = http://www.open-iscsi.org;
+    homepage = http://www.open-iscsi.com;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
new file mode 100644
index 00000000000..2ef08cd13ce
--- /dev/null
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, openssl, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "open-isns-${version}";
+  version = "0.95";
+
+  src = fetchFromGitHub {
+    owner = "gonzoleeman";
+    repo = "open-isns";
+    rev = "v${version}";
+    sha256 = "1c2x3yf9806gbjsw4xi805rfhyxk353a3whqvpccz8dwas6jajwh";
+  };
+
+  propagatedBuildInputs = [ openssl ];
+  outputs = ["out" "lib" ];
+  outputInclude = "lib";
+
+  installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns";
+  installTargets = "install install_hdrs install_lib";
+
+  meta = {
+    description = "iSNS server and client for Linux";
+    license = stdenv.lib.licenses.lgpl21;
+    homepage = https://github.com/gonzoleeman/open-isns;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48219c0929f..7b737c2aed2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10460,6 +10460,8 @@ in
 
   openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
+  openisns = callPackage ../os-specific/linux/open-isns { };
+
   tgt = callPackage ../tools/networking/tgt { };
 
   # -- Linux kernel expressions ------------------------------------------------