From c5413c6277ee682cd04bafd3f87802bcb447a85b Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Fri, 10 Oct 2025 18:48:09 +0200 Subject: [PATCH 1/2] sdrpp: 1.1.0-unstable-2024-01-22 -> 1.2.1-unstable-2025-10-09 --- pkgs/by-name/sd/sdrpp/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix index 847fea651aae..50f4db7b9528 100644 --- a/pkgs/by-name/sd/sdrpp/package.nix +++ b/pkgs/by-name/sd/sdrpp/package.nix @@ -69,15 +69,18 @@ stdenv.mkDerivation rec { # SDR++ uses a rolling release model. # Choose a git hash from head and use the date from that commit as # version qualifier - git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e"; - git_date = "2024-01-22"; - version = "1.1.0-unstable-" + git_date; + git_rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93"; + git_hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU="; + git_date = "2025-10-09"; + version_number = "1.2.1"; + + version = "${version_number}-unstable-" + git_date; src = fetchFromGitHub { owner = "AlexandreRouma"; repo = "SDRPlusPlus"; - rev = git_hash; - hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU="; + rev = git_rev; + hash = git_hash; }; patches = [ ./runtime-prefix.patch ]; @@ -90,7 +93,7 @@ stdenv.mkDerivation rec { --replace "codec2.h" "codec2/codec2.h" # Since the __TIME_ and __DATE__ is canonicalized in the build, # use our qualified version shown in the programs window title. - substituteInPlace core/src/version.h --replace "1.1.0" "$version" + substituteInPlace core/src/version.h --replace-fail "${version_number}" "$version" ''; nativeBuildInputs = [ From 67b4fb02ab376d670bfb4b1cc91cce08d02bcb51 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Fri, 10 Oct 2025 18:58:13 +0200 Subject: [PATCH 2/2] sdrpp: fix cmake 4 compatibility --- pkgs/by-name/sd/sdrpp/cmake4.patch | 27 +++++++++++++++++++++++++++ pkgs/by-name/sd/sdrpp/package.nix | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/sd/sdrpp/cmake4.patch diff --git a/pkgs/by-name/sd/sdrpp/cmake4.patch b/pkgs/by-name/sd/sdrpp/cmake4.patch new file mode 100644 index 000000000000..c40373d99f6b --- /dev/null +++ b/pkgs/by-name/sd/sdrpp/cmake4.patch @@ -0,0 +1,27 @@ +diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt +index 7fce281d..b709255f 100644 +--- a/core/libcorrect/CMakeLists.txt ++++ b/core/libcorrect/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.13) + project(Correct C) + include(CheckLibraryExists) + include(CheckIncludeFiles) +diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +index 1dc1c913..e9924677 100644 +--- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt ++++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required (VERSION 3.2.0) ++cmake_minimum_required (VERSION 3.13) + project (DiscordRPC) + + include(GNUInstallDirs) +@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES + + # add subdirs + +-add_subdirectory(src) +\ No newline at end of file ++add_subdirectory(src) diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix index 50f4db7b9528..19bba205f0b5 100644 --- a/pkgs/by-name/sd/sdrpp/package.nix +++ b/pkgs/by-name/sd/sdrpp/package.nix @@ -83,7 +83,12 @@ stdenv.mkDerivation rec { hash = git_hash; }; - patches = [ ./runtime-prefix.patch ]; + patches = [ + ./runtime-prefix.patch + # CMake 4 dropped support of versions lower than 3.5, + # versions lower than 3.10 are deprecated. + ./cmake4.patch + ]; postPatch = '' substituteInPlace CMakeLists.txt \