JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
iscsiadm can't load modules, so let's update open-iscsi and patch it.
This commit is contained in:
Joachim Fasting 2016-04-29 17:37:22 +02:00
commit 638e16e623
3 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/os-specific/linux/open-iscsi/default.nix
View File

@ -1,22 +1,23 @@
{ stdenv, fetchurl, nukeReferences }: { stdenv, fetchFromGitHub, nukeReferences, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
let stdenv.mkDerivation rec {
pname = "open-iscsi-2.0-873"; name = "open-iscsi-${version}";
in stdenv.mkDerivation { version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
name = pname;
outputs = [ "out" "iscsistart" ]; outputs = [ "out" "iscsistart" ];
buildInputs = [ nukeReferences ]; buildInputs = [ nukeReferences automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];
src = fetchurl { src = fetchFromGitHub {
urls = [ owner = "open-iscsi";
"http://www.open-iscsi.org/bits/${pname}.tar.gz" repo = "open-iscsi";
"http://pkgs.fedoraproject.org/repo/pkgs/iscsi-initiator-utils/${pname}.tar.gz/8b8316d7c9469149a6cc6234478347f7/${pname}.tar.gz" rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9";
]; sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8";
sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
}; };
DESTDIR = "$(out)"; DESTDIR = "$(out)";
NIX_LDFLAGS = "-lkmod";
NIX_CFLAGS_COMPILE = "-DUSE_KMOD";
preConfigure = '' preConfigure = ''
sed -i 's|/usr/|/|' Makefile sed -i 's|/usr/|/|' Makefile
''; '';
@ -30,7 +31,7 @@ in stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A high performance, transport independent, multi-platform implementation of RFC3720"; description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
homepage = http://www.open-iscsi.org; homepage = http://www.open-iscsi.com;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

25
pkgs/os-specific/linux/open-isns/default.nix Normal file
View File

@ -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;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -10460,6 +10460,8 @@ in
openiscsi = callPackage ../os-specific/linux/open-iscsi { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { };
openisns = callPackage ../os-specific/linux/open-isns { };
tgt = callPackage ../tools/networking/tgt { }; tgt = callPackage ../tools/networking/tgt { };
# -- Linux kernel expressions ------------------------------------------------ # -- Linux kernel expressions ------------------------------------------------