From 1d54f76d6f84eed0c93bfd9189d352c50e5233d4 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 16 Nov 2024 23:15:42 -0800
Subject: [PATCH 1/2] soapysdr: 0.8.1 -> 0.8.2-pre (fix python3.12 compat)

Instead of applying several patches, just use the latest.
The 0.8.2 checklist is mostly done and waiting on a SoapyUHD release,
but we already have Python 3.12 in nixpkgs.

https://github.com/pothosware/SoapySDR/issues/405#issue-1700158778
---
 pkgs/applications/radio/soapysdr/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 68d30ab73cfb..3051e38878c8 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   makeWrapper,
@@ -18,22 +17,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "soapysdr";
-  version = "0.8.1";
+  version = "0.8.2-pre";
 
   src = fetchFromGitHub {
     owner = "pothosware";
     repo = "SoapySDR";
-    rev = "soapy-sdr-${finalAttrs.version}";
-    sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2";
-  };
 
-  patches = [
-    # Fix for https://github.com/pothosware/SoapySDR/issues/352
-    (fetchpatch {
-      url = "https://github.com/pothosware/SoapySDR/commit/10c05b3e52caaa421147d6b4623eccd3fc3be3f4.patch";
-      hash = "sha256-D7so6NSZiU6SXbzns04Q4RjSZW0FJ+MYobvvVpVMjws=";
-    })
-  ];
+    # Instead of applying several patches for Python 3.12 compat, just take the latest, from:
+    # use old get python lib for v2 (#437)
+    rev = "8c6cb7c5223fad995e355486527589c63aa3b21e";
+    hash = "sha256-CKasL1mlpeuxXyPe6VDdAvb1l5a1cwWgyP7XX1aM73I=";
+  };
 
   nativeBuildInputs = [
     cmake

From 36a1705dcfc51977061cadd6f0ae1c38060bb37e Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 16 Nov 2024 23:29:59 -0800
Subject: [PATCH 2/2] soapysdr: add numinit as maintainer

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

diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix
index 3051e38878c8..de3420fb7c79 100644
--- a/pkgs/applications/radio/soapysdr/default.nix
+++ b/pkgs/applications/radio/soapysdr/default.nix
@@ -73,7 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/pothosware/SoapySDR";
     description = "Vendor and platform neutral SDR support library";
     license = licenses.boost;
-    maintainers = with maintainers; [ markuskowa ];
+    maintainers = with maintainers; [
+      markuskowa
+      numinit
+    ];
     mainProgram = "SoapySDRUtil";
     pkgConfigModules = [ "SoapySDR" ];
     platforms = platforms.unix;