nur-packages

commit 502f59a411eaf386b7535715b1a3cebc599cfc5b
parent 332b0df6706575a1570c0ff7732f560564584fa1
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Tue,  5 Jul 2022 21:50:02 +0300

sigdigger: 0.2.0-rc1 → 0.3.0

Diffstat:
M
pkgs/default.nix
 | 
5
++++-
M
pkgs/radio/sigdigger/default.nix
 | 
23
++++++++++++++---------
M
pkgs/radio/sigutils/default.nix
 | 
6
+++---
M
pkgs/radio/suscan/default.nix
 | 
11
+++--------
M
pkgs/radio/suwidgets/default.nix
 | 
12
+++++++-----

5 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -395,10 +395,13 @@ lib.makeScope newScope (
     rtlsdr-airband = callPackage ./radio/rtlsdr-airband { };
     sigdigger = libsForQt5.callPackage ./radio/sigdigger {
       inherit sigutils suscan suwidgets;
+      soapysdr = pkgs.soapysdr.override { extraPackages = [ pkgs.soapyrtlsdr ]; };
     };
     sigutils = callPackage ./radio/sigutils { };
     smallrx = callPackage ./radio/smallrx { };
-    suscan = callPackage ./radio/suscan { };
+    suscan = callPackage ./radio/suscan {
+      soapysdr = pkgs.soapysdr.override { extraPackages = [ pkgs.soapyrtlsdr ]; };
+    };
     suwidgets = libsForQt5.callPackage ./radio/suwidgets {
       inherit sigutils;
     };
diff --git a/pkgs/radio/sigdigger/default.nix b/pkgs/radio/sigdigger/default.nix
@@ -1,27 +1,32 @@
-{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, qmake, pkg-config
-, fftwFloat, sigutils, suscan, suwidgets, volk
-, fftw, libsndfile, soapysdr, soapyrtlsdr
-, portaudio
+{ lib, stdenv, fetchFromGitHub, pkg-config, qmake, wrapQtAppsHook
+, curl, fftw, fftwFloat, libsndfile, portaudio
+, sigutils, soapysdr, suscan, suwidgets, volk
 }:
 
 stdenv.mkDerivation rec {
   pname = "sigdigger";
-  version = "0.2.0-rc1";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "SigDigger";
     rev = "v${version}";
-    hash = "sha256-OWFPf1iIDhzgV7+pANp7lxzEBhxND0tIhB0VGNOeCak=";
+    hash = "sha256-dS+Fc0iQz7GIlGaR556Ur/EQh3Uzhqm9uBW42IuEqoE=";
   };
 
   nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
 
   buildInputs = [
-    fftwFloat sigutils suscan suwidgets volk
-    fftw libsndfile
+    curl
+    fftw
+    fftwFloat
+    libsndfile
     portaudio
-    (soapysdr.override { extraPackages = [ soapyrtlsdr ]; })
+    sigutils
+    soapysdr
+    suscan
+    suwidgets
+    volk
   ];
 
   qmakeFlags = [ "SUWIDGETS_PREFIX=${suwidgets}" "SigDigger.pro" ];
diff --git a/pkgs/radio/sigutils/default.nix b/pkgs/radio/sigutils/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sigutils";
-  version = "2021-07-17";
+  version = "2022-07-05";
 
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = pname;
-    rev = "0b0be80d1c76803a1f463bb68a470d81afcc5101";
-    hash = "sha256-ImeyR6iDIfgu2Pp4JcCzp+pJXVMmPLUps4kHsjsqsxM=";
+    rev = "1d7559d427aadd253dd825eef26bf15e54860c5f";
+    hash = "sha256-wvd6sixwGmR9R4x+swLVqXre4Dqnj10jZIXUfaJcmBw=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/pkgs/radio/suscan/default.nix b/pkgs/radio/suscan/default.nix
@@ -4,20 +4,15 @@
 
 stdenv.mkDerivation rec {
   pname = "suscan";
-  version = "2021-07-17";
+  version = "2022-07-05";
 
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = pname;
-    rev = "09fd8cf1f220ae707a877107163515114d9eb671";
-    hash = "sha256-KU3JaGIL65LWJWc6Iw/eyKdUMnVQ85g0MtmuSPGdp44=";
+    rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab";
+    hash = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M=";
   };
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace "set(XML2_INCLUDE_DIRS" "#set(XML2_INCLUDE_DIRS"
-  '';
-
   nativeBuildInputs = [ cmake pkg-config ];
 
   buildInputs = [ fftwFloat libsndfile libxml2 sigutils soapysdr volk ];
diff --git a/pkgs/radio/suwidgets/default.nix b/pkgs/radio/suwidgets/default.nix
@@ -1,16 +1,16 @@
-{ lib, mkDerivation, fetchFromGitHub, qmake, pkg-config
+{ lib, stdenv, fetchFromGitHub, qmake, pkg-config
 , fftw, sigutils
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "suwidgets";
-  version = "2021-07-17";
+  version = "2022-04-03";
 
   src = fetchFromGitHub {
     owner = "BatchDrake";
     repo = "SuWidgets";
-    rev = "c45b2af3b24115335bf993671198f419fa3ed0f7";
-    hash = "sha256-p+kgmtDWuBLlh8IJP5FeximeJSfz9M6Il3SRYz0TJgI=";
+    rev = "826b3eeae5b682dc063f53b427caa9c7c48131ea";
+    hash = "sha256-cyFLsP+8GbALdlgEnVX4201Qq/KAxb/Vv+sJqbFpvUk=";
   };
 
   nativeBuildInputs = [ qmake pkg-config ];
@@ -21,6 +21,8 @@ mkDerivation rec {
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
+  dontWrapQtApps = true;
+
   meta = with lib; {
     description = "Sigutils-related widgets";
     inherit (src.meta) homepage;