From 75de7cb4cfbbf1c5d7a9e2f808e3b68116bd73f2 Mon Sep 17 00:00:00 2001 From: Andrew Zah Date: Sat, 18 Oct 2025 16:44:10 +0900 Subject: [PATCH] zsync2: 2.0.0-alpha-1-20230304 -> 2.0.0-alpha-1-20250926 * This update also fixes the cmake 4 issue outlined in https://github.com/nixos/nixpkgs/issues/445447. --- pkgs/by-name/zs/zsync2/package.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/zs/zsync2/package.nix b/pkgs/by-name/zs/zsync2/package.nix index c39eee9baa76..ead4189ad33a 100644 --- a/pkgs/by-name/zs/zsync2/package.nix +++ b/pkgs/by-name/zs/zsync2/package.nix @@ -2,33 +2,24 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, libgcrypt, libcpr, libargs, + zlib, }: - stdenv.mkDerivation (finalAttrs: { pname = "zsync2"; - version = "2.0.0-alpha-1-20230304"; + version = "2.0.0-alpha-1-20250926"; src = fetchFromGitHub { owner = "AppImageCommunity"; repo = "zsync2"; rev = finalAttrs.version; - hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0="; + hash = "sha256-dbIe47cDaQJAOiHcLRwEbLgvrDUHOnPkYqDbkX74gZk="; }; - patches = [ - # Add missing cstdint includes - (fetchpatch { - url = "https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch"; - hash = "sha256-iLXxD6v+pSwFKmwAEyzbYUJ3DmtpvV/DYr8kcD+t5Cg="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'VERSION "2.0.0-alpha-1"' 'VERSION "${finalAttrs.version}"' \ @@ -46,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { libgcrypt libcpr libargs + zlib ]; cmakeFlags = [ @@ -53,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_ARGS" true) ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + env.NIX_CFLAGS_COMPILE = "-lz -Wno-error=incompatible-pointer-types"; meta = { description = "Rewrite of the advanced file download/sync tool zsync";