nzbget: 24.5 -> 24.6 (#385159)

This commit is contained in:
Peder Bergebakken Sundt
2025-03-03 06:41:43 +01:00
committed by GitHub
2 changed files with 23 additions and 10 deletions
+4 -4
View File
@@ -21,19 +21,19 @@ let
par2TurboSrc = fetchFromGitHub {
owner = "nzbgetcom";
repo = "par2cmdline-turbo";
rev = "v1.1.1-nzbget-20241128"; # from cmake/par2-turbo.cmake
hash = "sha256-YBv61DAUWgf4jGQciTsGX7SAC2oZZ6h/lnJgJ40gMZE=";
rev = "v1.2.0-nzbget-20250213"; # from cmake/par2-turbo.cmake
hash = "sha256-IHoSvW9bKxMRXbxd41A5268rpi7/+LRxC3HANHtawkQ=";
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "nzbget";
version = "24.5";
version = "24.6";
src = fetchFromGitHub {
owner = "nzbgetcom";
repo = "nzbget";
rev = "v${finalAttrs.version}";
hash = "sha256-HftzgdG6AjCyJVMV2btjBRLJLQ0wc1f8FJzGDWrdxR4=";
hash = "sha256-N2cYnZUk5//hjNRen1FaIlvG+nC2tXtvffr368AIOkA=";
};
patches = [
+19 -6
View File
@@ -1,8 +1,17 @@
From 78c826e1f4ccee24652f5301b720f05866ec00c6 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
---
cmake/par2-turbo.cmake | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/cmake/par2-turbo.cmake b/cmake/par2-turbo.cmake
index 4fa76b54..cf293452 100644
index b0f2e70e..ff3389e0 100644
--- a/cmake/par2-turbo.cmake
+++ b/cmake/par2-turbo.cmake
@@ -24,17 +24,13 @@ if(CMAKE_SYSROOT)
@@ -39,18 +39,13 @@ if(CMAKE_SYSROOT)
)
endif()
@@ -10,20 +19,24 @@ index 4fa76b54..cf293452 100644
- par2-turbo
- PREFIX par2-turbo
- GIT_REPOSITORY https://github.com/nzbgetcom/par2cmdline-turbo.git
- GIT_TAG v1.1.1-nzbget-20241128
- GIT_TAG v1.2.0-nzbget-20250213
- TLS_VERIFY TRUE
- GIT_SHALLOW TRUE
- GIT_PROGRESS TRUE
- DOWNLOAD_EXTRACT_TIMESTAMP TRUE
- CMAKE_ARGS ${CMAKE_ARGS}
- 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 ""
)
if(WIN32)
set(LIBS ${LIBS} ${PAR2_LIBS})
--
2.48.1