From c5676fa70179560aa25804dc21ea83b92c072927 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Sep 2019 23:48:21 -0700 Subject: [PATCH 1/2] urh: 2.7.3 -> 2.7.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/urh/versions --- pkgs/applications/radio/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index a1b92e7e4e1..f2c1e38649f 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.7.3"; + version = "2.7.5"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35"; + sha256 = "0v9038gl8340vdw8l30vjgjh5z7yys5w1cv9smgm1fzkcys392mh"; }; buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ] From bfed1553a1ec5e304739ddbb281b351040c6b13d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 12 Nov 2019 22:10:55 +0100 Subject: [PATCH 2/2] urh: 2.7.5 -> 2.8.0 Fix build: * add wrapQtApps * add setup tools --- pkgs/applications/radio/urh/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index f2c1e38649f..d4056dca7bf 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,25 +1,31 @@ { stdenv, lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio +, qt5 , USRPSupport ? false, uhd }: python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.7.5"; + version = "2.8.0"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "0v9038gl8340vdw8l30vjgjh5z7yys5w1cv9smgm1fzkcys392mh"; + sha256 = "1c87lff9bqhf574420ycqz88x6ad5hmy36wrb8pi0dqd1s1d72qb"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ] ++ lib.optional USRPSupport uhd; propagatedBuildInputs = with python3Packages; [ - pyqt5 numpy psutil cython pyzmq pyaudio + pyqt5 numpy psutil cython pyzmq pyaudio setuptools ]; + postFixup = '' + wrapQtApp $out/bin/urh + ''; + doCheck = false; meta = with lib; {