Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5c9b19a4a976
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 651baa7deda0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 24, 2018

  1. openiscsi: 2.0-873 -> 2.0-877

    @zaninime
    zaninime committed Nov 24, 2018
    Copy the full SHA
    6ce3525 View commit details

  2. Merge pull request #50873 from zaninime/openscsi 

    openiscsi: 2.0-873 -> 2.0-877
    @markuskowa
    markuskowa authored Nov 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    651baa7 View commit details
Showing with 17 additions and 13 deletions.
  1. +17 −13 pkgs/os-specific/linux/open-iscsi/default.nix
30 changes: 17 additions & 13 deletions pkgs/os-specific/linux/open-iscsi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext, utillinux, openisns, openssl, kmod }:
{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext
, utillinux, openisns, openssl, kmod, perl, systemd, pkgconf
}:

stdenv.mkDerivation rec {
name = "open-iscsi-${version}";
version = "2.0-873-${stdenv.lib.substring 0 7 src.rev}";
version = "2.0.877";

nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
buildInputs = [ kmod openisns.lib openssl systemd utillinux ];

buildInputs = [ automake autoconf libtool gettext utillinux openisns.lib openssl kmod ];

src = fetchFromGitHub {
owner = "open-iscsi";
repo = "open-iscsi";
rev = "4c1f2d90ef1c73e33d9f1e4ae9c206ffe015a8f9";
sha256 = "0h030zk4zih3l8z5662b3kcifdxlakbwwkz1afb7yf0cicds7va8";
rev = version;
sha256 = "0v3dsrl34pdx0yl5jsanrpgg3vw466rl8k81hkshgq3a5mq5qhf6";
};

DESTDIR = "$(out)";
NIX_LDFLAGS = "-lkmod";

NIX_LDFLAGS = "-lkmod -lsystemd";
NIX_CFLAGS_COMPILE = "-DUSE_KMOD";

preConfigure = ''
sed -i 's|/usr|/|' Makefile
'';

postInstall = ''
cp usr/iscsistart $out/sbin/
$out/sbin/iscsistart -v
'';

meta = with stdenv.lib; {
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = licenses.gpl2Plus;
homepage = http://www.open-iscsi.com;
license = licenses.gpl2;
homepage = https://www.open-iscsi.com;
platforms = platforms.linux;
maintainers = with maintainers; [ cleverca22 ];
maintainers = with maintainers; [ cleverca22 zaninime ];
};
}