From 21308a98015aa1efe9feef91cf9aef4303151eab Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sun, 5 Oct 2025 18:21:47 +0200
Subject: [PATCH 1/3] soapysdr: 0.8.1-unstable-2025-03-30-03 ->
 0.8.1-unstable-2025-10-05-03

---
 pkgs/applications/radio/soapysdr/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 4b28ee5cb398..b2c3592845fb 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -18,16 +18,15 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "soapysdr";
   # Don't forget to change passthru.abiVersion
-  version = "0.8.1-unstable-2025-03-30-03";
+  version = "0.8.1-unstable-2025-10-05-03";
 
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "SoapySDR";
 
-    # Instead of applying several patches for Python 3.12 compat, just take the latest, from:
-    # use old get python lib for v2 (#437)
-    rev = "fbf9f3c328868f46029284716df49095ab7b99a6";
-    hash = "sha256-W4915c6hV/GR5PZRRXZJW3ERsZmQQQ08EA9wYp2tAVk=";
+    # update to include latest patch for newer cmake support
+    rev = "1667b4e6301d7ad47b340dcdcd6e9969bf57d843";
+    hash = "sha256-UCpYBUb2k1bHy1z2Mvmv+1ZX1BloSsPrTydFV3Ga3Os=";
   };
 
   nativeBuildInputs = [

From f2b67e028cc46cee93be2d45068789a9e487d14f Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sun, 5 Oct 2025 21:24:41 +0200
Subject: [PATCH 2/3] soapyrtlsdr: fix cmake 4 compatibility

---
 pkgs/by-name/so/soapyrtlsdr/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/so/soapyrtlsdr/package.nix b/pkgs/by-name/so/soapyrtlsdr/package.nix
index 31154d62b863..2dbc572ae08f 100644
--- a/pkgs/by-name/so/soapyrtlsdr/package.nix
+++ b/pkgs/by-name/so/soapyrtlsdr/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   pkg-config,
   rtl-sdr,
@@ -28,6 +29,20 @@ stdenv.mkDerivation (finalAttrs: {
     soapysdr
   ];
 
+  patches = [
+    (fetchpatch2 {
+      name = "cmake-update.patch";
+      url = "https://github.com/pothosware/SoapyRTLSDR/commit/448c9d0d326c2600905b7ce84222ff9d72ba2189.patch?full_index=1";
+      hash = "sha256-hWlNowkf9yZM6p+EGh+IiUm2JfG5mLe8Qq8gTVIdIak=";
+    })
+
+    (fetchpatch2 {
+      name = "fix-cmake4-build.patch";
+      url = "https://github.com/pothosware/SoapyRTLSDR/commit/bb2d1511b957138051764c9193a3d6971e912b85.patch?full_index=1";
+      hash = "sha256-C90B5WMjx1lJKiX0F/cAfGmz2WRc2BA84FTmVmnC+DI=";
+    })
+  ];
+
   cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
 
   meta = with lib; {

From b2eeb6bab79606982d641c1f0375b5a7fc87186c Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sun, 5 Oct 2025 21:39:50 +0200
Subject: [PATCH 3/3] soapyuhd: fix cmake 4 compatibility

---
 pkgs/by-name/so/soapyuhd/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/soapyuhd/package.nix b/pkgs/by-name/so/soapyuhd/package.nix
index fba5ed77970d..444707bf320a 100644
--- a/pkgs/by-name/so/soapyuhd/package.nix
+++ b/pkgs/by-name/so/soapyuhd/package.nix
@@ -11,13 +11,14 @@
 
 stdenv.mkDerivation {
   pname = "soapyuhd";
-  version = "0.4.1-unstable-2025-02-13";
+  version = "0.4.1-unstable-2025-10-05";
 
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "SoapyUHD";
-    rev = "6b521393cc45c66770f3d4bc69eac7dda982174c";
-    sha256 = "qg0mbw3S973cnok6tVx7Y38ijOQcJdHtPLi889uo7tI=";
+    # version that supports cmake 4
+    rev = "cf78b9ca3bddfc9263d2acb7e8afcb0036938163";
+    hash = "sha256-/hJ78dUL477gX3c2kV8kUknIk01PUf+ie1Gl7Ujq1Ac=";
   };
 
   nativeBuildInputs = [