gnuradio3_8: remove

pkgs/applications/radio/gnuradio/default.nix

@@ -10,7 +10,6 @@
 , orc
 , boost
 , spdlog
-, swig
 , mpir
 , doxygen
 , python
@@ -21,7 +20,6 @@
 , libjack2
 , libiio
 , libad9361
-, CoreAudio
 , uhd
 , SDL
 , gsl
@@ -173,7 +171,6 @@ let
     gr-audio = {
       runtime = []
         ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ]
       ;
       cmakeEnableFlag = "GR_AUDIO";
     };

pkgs/applications/radio/qradiolink/default.nix

@@ -3,7 +3,8 @@
 , libpulseaudio
 , libconfig
 # Needs a gnuradio built with qt gui support
-, gnuradio3_8
+, gnuradio
+, log4cpp
 , thrift
 # Not gnuradioPackages'
 , codec2
@@ -22,15 +23,16 @@
 , uhd
 }:
 
-gnuradio3_8.pkgs.mkDerivation rec {
+gnuradio.pkgs.mkDerivation rec {
   pname = "qradiolink";
-  version = "0.9.0-1";
+  # https://github.com/qradiolink/qradiolink/tree/gr_3.10
+  version = "0.9.0-1-unstable-2024-08-29";
 
   src = fetchFromGitHub {
     owner = "qradiolink";
     repo = "qradiolink";
-    rev = version;
-    sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI=";
+    rev = "f1006a20e0a642d0ac20aab18b19fa97567f2621";
+    sha256 = "sha256-9AYFO+mmwLAH8gEpZn6qcENabc/KBMcg/0wCTKsInNY=";
   };
 
   preBuild = ''
@@ -48,35 +50,40 @@ gnuradio3_8.pkgs.mkDerivation rec {
   '';
 
   buildInputs = [
-    gnuradio3_8.unwrapped.boost
+    gnuradio.unwrapped.boost
     codec2
-    gnuradio3_8.unwrapped.logLib
+    gnuradio.unwrapped.logLib
+    # gnuradio uses it's own log library (spdlog), and qradiolink is still
+    # using the old gnuradio log library log4cpp. Perhaps this won't be needed
+    # once the gr_3.10 branch will mature enough to be merged into qradiolink's
+    # master branch.
+    log4cpp
     gmp
     libpulseaudio
     libconfig
     gsm
-    gnuradio3_8.pkgs.osmosdr
+    gnuradio.pkgs.osmosdr
     libopus
     libjpeg
     limesuite
     soapysdr-with-plugins
     speex
     speexdsp
-    gnuradio3_8.qt.qtbase
-    gnuradio3_8.qt.qtmultimedia
+    gnuradio.qt.qtbase
+    gnuradio.qt.qtmultimedia
     libftdi
     libsndfile
     cppzmq
-    gnuradio3_8.qwt
+    gnuradio.qwt
     uhd
-  ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
+  ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [
     thrift
-    gnuradio3_8.unwrapped.python.pkgs.thrift
+    gnuradio.unwrapped.python.pkgs.thrift
   ];
   nativeBuildInputs = [
     protobuf
-    gnuradio3_8.qt.qmake
-    gnuradio3_8.qt.wrapQtAppsHook
+    gnuradio.qt.qmake
+    gnuradio.qt.wrapQtAppsHook
   ];
 
   meta = with lib; {