diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-05-03 15:14:25 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-05-07 11:19:19 +0200 |
commit | d92b2b6a1bbd322dd65a8b6f51019610d350046e (patch) | |
tree | 7f7c21927b9cc05676501f297c51eb76b49e326c /nixpkgs/pkgs/development/libraries/libiscsi/default.nix | |
parent | 93c9e56b40530cc627d921cfc255c05b495d4017 (diff) | |
parent | 49050352f602fe87d16ff7b2b6a05b79eb20dc6f (diff) | |
download | nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.gz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.bz2 nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.lz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.xz nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.tar.zst nixlib-d92b2b6a1bbd322dd65a8b6f51019610d350046e.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'
Conflicts: nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libiscsi/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libiscsi/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libiscsi/default.nix b/nixpkgs/pkgs/development/libraries/libiscsi/default.nix index 826593b9d66c..1008037c60cc 100644 --- a/nixpkgs/pkgs/development/libraries/libiscsi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libiscsi/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { pname = "libiscsi"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libiscsi"; rev = version; - sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; + sha256 = "sha256-idiK9JowKhGAk5F5qJ57X14Q2Y0TbIKRI02onzLPkas="; }; postPatch = '' substituteInPlace lib/socket.c \ - --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + --replace-fail "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" ''; nativeBuildInputs = [ autoreconfHook ]; - # This problem is gone on libiscsi master. - env.NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"); + env = lib.optionalAttrs (stdenv.is32bit || stdenv.isDarwin) { + # iscsi-discard.c:223:57: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] + NIX_CFLAGS_COMPILE = "-Wno-error=format"; + }; meta = with lib; { description = "iscsi client library and utilities"; |