From a915c8f33b5734be0f5165c8f2d22e873a1f4622 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 27 Dec 2020 02:58:46 +0100 Subject: [PATCH 1/2] soapyuhd: 0.3.6 -> 0.4.1 --- pkgs/applications/radio/soapyuhd/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index a169116c29a..a5169ec06a9 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , uhd, boost, soapysdr } : -let - version = "0.3.6"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soapyuhd"; - inherit version; + version = "0.4.1"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyUHD"; rev = "soapy-uhd-${version}"; - sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7"; + sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; From b3e155a11b5687fe07ef5acd9d0a0c6fdac9e943 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 27 Dec 2020 12:17:51 +0100 Subject: [PATCH 2/2] soapyuhd: fix license --- pkgs/applications/radio/soapyuhd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index a5169ec06a9..b2223d1abb7 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; };