From 471e63915f8e61ae6c5370b7b087303460c2ca65 Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Wed, 23 Jun 2021 11:04:59 +0200
Subject: [PATCH] libzip: 1.7.3 -> 1.8.0

---
 pkgs/development/libraries/libzip/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index a3f7f3ef5f6f..3620943d6c53 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