From 60804040e8bebb9affcffb10bb5bcedbc18016f1 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sat, 30 May 2026 07:12:28 -0500
Subject: [PATCH] nzbget: 26.0 -> 26.1

---
 pkgs/by-name/nz/nzbget/package.nix            | 28 +++++----
 pkgs/by-name/nz/nzbget/remove-git-usage.patch | 63 ++++++++++---------
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix
index c90710075a86..c7f26a3e7ba7 100644
--- a/pkgs/by-name/nz/nzbget/package.nix
+++ b/pkgs/by-name/nz/nzbget/package.nix
@@ -22,23 +22,29 @@ let
   par2TurboSrc = fetchFromGitHub {
     owner = "nzbgetcom";
     repo = "par2cmdline-turbo";
-    rev = "v1.3.0-20250808"; # from cmake/par2-turbo.cmake
-    hash = "sha256-ZP8AI5htmEcxQQtvgShcQ8qNoRL+jBR1BdKS6yyuB/E=";
+    rev = "v1.4.0-20260323"; # from cmake/par2-turbo.cmake
+    hash = "sha256-oeQY7GJkaEmxEqJALpjAPFpfq+YsNWv4VajotE25xCI=";
+  };
+  rapidyencSrc = fetchFromGitHub {
+    owner = "nzbgetcom";
+    repo = "rapidyenc";
+    rev = "v1.1.1-20260217"; # from cmake/rapidyenc.cmake
+    hash = "sha256-1K0LrB1AhacYS/54eCn+vQFAwP6IUVUrPCqFopojXDE=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nzbget";
-  version = "26.0";
+  version = "26.1";
 
   src = fetchFromGitHub {
     owner = "nzbgetcom";
     repo = "nzbget";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IyaTe0bBQKnIuG3wq29KMZjKSiKu3Atd3GsNg8PGhRI=";
+    hash = "sha256-sZwUixSoqs0l2KOx6WnvLTCUGsSAO4QCTKqnhD58r70=";
   };
 
   patches = [
-    # remove git usage for fetching modified+vendored par2cmdline-turbo
+    # remove git usage for fetching modified+vendored par2cmdline-turbo and rapidyenc
     ./remove-git-usage.patch
   ];
 
@@ -60,13 +66,13 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
-  preConfigure = ''
-    mkdir -p build/par2-turbo/src
-    cp -r ${par2TurboSrc} build/par2-turbo/src/par2-turbo
-    chmod -R u+w build/par2-turbo/src/par2-turbo
-  '';
-
   postPatch = ''
+    substituteInPlace cmake/par2-turbo.cmake \
+      --subst-var-by 'par2_turbo_src' '${par2TurboSrc}' \
+
+    substituteInPlace cmake/rapidyenc.cmake \
+      --subst-var-by 'rapidyenc_src' '${rapidyencSrc}'
+
     substituteInPlace daemon/util/Util.cpp \
       --replace-fail "std::string(\"uname \")" "std::string(\"${lib.getExe deterministic-uname} \")"
   '';
diff --git a/pkgs/by-name/nz/nzbget/remove-git-usage.patch b/pkgs/by-name/nz/nzbget/remove-git-usage.patch
index 226b52cb9fe7..481ea076f230 100644
--- a/pkgs/by-name/nz/nzbget/remove-git-usage.patch
+++ b/pkgs/by-name/nz/nzbget/remove-git-usage.patch
@@ -1,42 +1,47 @@
-From 15dc4c64531845b64b574647fc7218170b100533 Mon Sep 17 00:00:00 2001
+From f0fc5eb48ff3a0e6f350bf1db6388a458a653cf7 Mon Sep 17 00:00:00 2001
 From: Morgan Helton <mhelton@gmail.com>
-Date: Tue, 25 Feb 2025 20:36:19 -0600
-Subject: [PATCH] feat: use pre-fetched par2-turbo
+Date: Sat, 30 May 2026 06:59:25 -0500
+Subject: [PATCH] chore: use placeholders for par2-turbo and rapidyenc
 
 ---
- cmake/par2-turbo.cmake | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
+ cmake/par2-turbo.cmake | 6 +-----
+ cmake/rapidyenc.cmake  | 6 +-----
+ 2 files changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/cmake/par2-turbo.cmake b/cmake/par2-turbo.cmake
-index 0062b4d3..c0dd56ea 100644
+index 16a80ffa..992bfe79 100644
 --- a/cmake/par2-turbo.cmake
 +++ b/cmake/par2-turbo.cmake
-@@ -48,18 +48,13 @@ if(CMAKE_SYSROOT)
- 	)
- endif()
- 
--ExternalProject_add(
--	par2-turbo
--	PREFIX			par2-turbo
+@@ -56,11 +56,7 @@ endif()
+ ExternalProject_add(
+ 	par2-turbo
+ 	PREFIX			par2-turbo
 -	GIT_REPOSITORY	https://github.com/nzbgetcom/par2cmdline-turbo.git
--	GIT_TAG			v1.3.0-20250808
+-	GIT_TAG			v1.4.0-20260323
 -	TLS_VERIFY		TRUE
 -	GIT_SHALLOW		TRUE
 -	GIT_PROGRESS	TRUE
--	DOWNLOAD_EXTRACT_TIMESTAMP	TRUE
--	BUILD_BYPRODUCTS ${PAR2_LIBS}
--	CMAKE_ARGS		 ${CMAKE_ARGS}
--	INSTALL_COMMAND	""
-+ExternalProject_Add(
-+    	par2-turbo
-+    	PREFIX par2-turbo 
-+    	SOURCE_DIR ${CMAKE_BINARY_DIR}/par2-turbo/src/par2-turbo
-+    	BUILD_BYPRODUCTS ${PAR2_LIBS}
-+    	CMAKE_ARGS ${CMAKE_ARGS}
-+    	INSTALL_COMMAND ""
- )
- 
- set(LIBS ${LIBS} ${PAR2_LIBS})
++	URL @par2_turbo_src@
+ 	DOWNLOAD_EXTRACT_TIMESTAMP	TRUE
+ 	BUILD_BYPRODUCTS ${PAR2_LIBS}
+ 	CMAKE_ARGS		 ${CMAKE_ARGS}
+diff --git a/cmake/rapidyenc.cmake b/cmake/rapidyenc.cmake
+index 9242efe4..0e8d7527 100644
+--- a/cmake/rapidyenc.cmake
++++ b/cmake/rapidyenc.cmake
+@@ -51,11 +51,7 @@ endif()
+ ExternalProject_add(
+ 	rapidyenc
+ 	PREFIX			rapidyenc
+-	GIT_REPOSITORY	https://github.com/nzbgetcom/rapidyenc.git
+-	GIT_TAG			v1.1.1-20260217
+-	TLS_VERIFY		TRUE
+-	GIT_SHALLOW		TRUE
+-	GIT_PROGRESS	TRUE
++	URL @rapidyenc_src@
+ 	DOWNLOAD_EXTRACT_TIMESTAMP	TRUE
+ 	BUILD_BYPRODUCTS ${RAPIDYENC_LIBS}
+ 	CMAKE_ARGS		 ${CMAKE_ARGS}
 -- 
-2.50.1
+2.54.0