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: 66ee262b5c95
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 882a8266874b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 28, 2019

  1. openiscsi: 2.0.878 -> 2.1.0

    @r-ryantm
    r-ryantm committed Nov 28, 2019
    Copy the full SHA
    75deccb View commit details

Commits on Nov 29, 2019

  1. open-iscsi: fix path in iscsi_fw_login

    @markuskowa
    markuskowa committed Nov 29, 2019
    Copy the full SHA
    220b417 View commit details

  2. Merge pull request #74517 from r-ryantm/auto-update/open-iscsi 

    openiscsi: 2.0.878 -> 2.1.0
    @markuskowa
    markuskowa authored Nov 29, 2019
    Copy the full SHA
    882a826 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/os-specific/linux/open-iscsi/default.nix
8 changes: 6 additions & 2 deletions pkgs/os-specific/linux/open-iscsi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

stdenv.mkDerivation rec {
pname = "open-iscsi";
version = "2.0.878";
version = "2.1.0";

nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
buildInputs = [ kmod openisns.lib openssl systemd utillinux ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "open-iscsi";
repo = "open-iscsi";
rev = version;
sha256 = "0hkprlni0z1zdkrmhd897knyfws0l95bz67fgp0vvf63ag08b5ly";
sha256 = "0z7rnbfa48j3r4ij7335xgjfb835gnnp10v7q6lvwg7bq6v5xvih";
};

DESTDIR = "$(out)";
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
$out/sbin/iscsistart -v
'';

postFixup = ''
sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login
'';

meta = with stdenv.lib; {
description = "A high performance, transport independent, multi-platform implementation of RFC3720";
license = licenses.gpl2;