diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index a3f7f3ef5f6..3620943d6c5 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, fetchpatch , fetchurl , perl , zlib @@ -11,32 +10,27 @@ , xz , withOpenssl ? false , openssl +, withZstd ? false +, zstd }: stdenv.mkDerivation rec { pname = "libzip"; - version = "1.7.3"; + version = "1.8.0"; src = fetchurl { url = "https://libzip.org/download/${pname}-${version}.tar.gz"; - sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf"; + sha256 = "17l3ygrnbszm3b99dxmw94wcaqpbljzg54h4c0y8ss8aij35bvih"; }; - # Remove in next release - patches = [ - (fetchpatch { - url = "https://github.com/nih-at/libzip/commit/351201419d79b958783c0cfc7c370243165523ac.patch"; - sha256 = "0d93z98ki0yiaza93268cxkl35y1r7ll9f7l8sivx3nfxj2c1n8a"; - }) - ]; - outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ cmake perl groff ]; propagatedBuildInputs = [ zlib ]; buildInputs = lib.optionals withLZMA [ xz ] ++ lib.optionals withBzip2 [ bzip2 ] - ++ lib.optionals withOpenssl [ openssl ]; + ++ lib.optionals withOpenssl [ openssl ] + ++ lib.optionals withZstd [ zstd ]; preCheck = '' # regress/runtest is a generated file