From 1d331c2db2951a0d4dc7ba30232b01f421d42579 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 16 Nov 2024 23:15:42 -0800 Subject: [PATCH] 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 (cherry picked from commit 1d54f76d6f84eed0c93bfd9189d352c50e5233d4) --- 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