From ee6a0a3fd90693c44c14ed551edfaf9f7dd2ce71 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 21 Apr 2023 11:38:42 +0300 Subject: [PATCH 1/6] gnuradio: Remove unsused fetchpatch and rec from main expressions --- pkgs/applications/radio/gnuradio/3.8.nix | 2 +- pkgs/applications/radio/gnuradio/3.9.nix | 3 +-- pkgs/applications/radio/gnuradio/default.nix | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 1c53482143e6..d8c53d2badfe 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -225,7 +225,7 @@ let inherit (shared) hasFeature; # function in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname; inherit (shared) version diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 170aa554e99d..7658b32be655 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake # Remove gcc and python references , removeReferencesTo @@ -259,7 +258,7 @@ let inherit (shared) hasFeature; # function in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname; inherit (shared) version diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 4a98fc0ddf8d..3233df7e37c5 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake # Remove gcc and python references , removeReferencesTo @@ -278,7 +277,7 @@ let inherit (shared) hasFeature; # function in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit pname; inherit (shared) version From 73640c6fbaed78b530450a64674485dc934614d8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Apr 2023 14:54:30 +0300 Subject: [PATCH 2/6] gnuradio3_9: Add libsndfile for gr-blocks --- pkgs/applications/radio/gnuradio/3.9.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 7658b32be655..263440f79c4b 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -140,6 +140,9 @@ let }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; + runtime = [ + libsndfile + ]; }; gr-fec = { cmakeEnableFlag = "GR_FEC"; From 1dd64003d29e611cebe98d10d52293270a539073 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 15 Apr 2023 20:13:20 +0300 Subject: [PATCH 3/6] gnuradio: Add libsndfile for gr-blocks --- pkgs/applications/radio/gnuradio/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 3233df7e37c5..1c12454e21a3 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -142,6 +142,10 @@ let }; gr-blocks = { cmakeEnableFlag = "GR_BLOCKS"; + runtime = [ + # Required to compile wavfile blocks. + libsndfile + ]; }; gr-fec = { cmakeEnableFlag = "GR_FEC"; From 2634268fa65a862f44bc9353e041bbcabebd01f4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 21 Apr 2023 12:48:49 +0300 Subject: [PATCH 4/6] gnuradio: Define a common logLib attribute Use it in all gnuradio modules. --- pkgs/applications/radio/gnss-sdr/default.nix | 7 ++----- pkgs/applications/radio/gnuradio/3.8.nix | 4 +++- pkgs/applications/radio/gnuradio/3.9.nix | 4 +++- pkgs/applications/radio/gnuradio/default.nix | 4 +++- pkgs/applications/radio/gqrx/default.nix | 2 +- pkgs/applications/radio/qradiolink/default.nix | 2 +- pkgs/development/gnuradio-modules/ais/default.nix | 4 ++-- pkgs/development/gnuradio-modules/grnet/default.nix | 4 ++-- pkgs/development/gnuradio-modules/gsm/default.nix | 4 ++-- pkgs/development/gnuradio-modules/limesdr/default.nix | 4 ++-- pkgs/development/gnuradio-modules/nacl/default.nix | 4 ++-- pkgs/development/gnuradio-modules/osmosdr/default.nix | 4 ++-- pkgs/development/gnuradio-modules/rds/default.nix | 4 ++-- pkgs/top-level/gnuradio-packages.nix | 7 ++----- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 725f531dd072..c1d3950bed01 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -60,13 +60,10 @@ gnuradio.pkgs.mkDerivation rec { pugixml protobuf gnuradio.unwrapped.boost + gnuradio.unwrapped.logLib ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [ gnuradio.unwrapped.uhd - ] ++ (if (lib.versionAtLeast gnuradio.unwrapped.versionAttr.major "3.10") then [ - gnuradio.unwrapped.spdlog - ] else [ - gnuradio.unwrapped.log4cpp - ]) ++ lib.optionals (enableRawUdp) [ + ] ++ lib.optionals (enableRawUdp) [ libpcap ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index d8c53d2badfe..e10d3df374e2 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -253,8 +253,10 @@ stdenv.mkDerivation { inherit boost volk - log4cpp ; + # Used by many gnuradio modules, the same attribute is present in + # gnuradio3.10 where there it's spdlog. + logLib = log4cpp; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 263440f79c4b..a393cd5528d5 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -285,8 +285,10 @@ stdenv.mkDerivation { inherit boost volk - log4cpp ; + # Used by many gnuradio modules, the same attribute is present in + # gnuradio3.10 where there it's spdlog. + logLib = log4cpp; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-qtgui") { diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 1c12454e21a3..ca0f7fb97eac 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -305,8 +305,10 @@ stdenv.mkDerivation { inherit boost volk - spdlog ; + # Used by many gnuradio modules, the same attribute is present in + # previous gnuradio versions where there it's log4cpp. + logLib = spdlog; } // lib.optionalAttrs (hasFeature "gr-uhd") { inherit uhd; } // lib.optionalAttrs (hasFeature "gr-pdu") { diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index c011e5a4d0a7..3e3c3f6bef95 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -43,7 +43,7 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ - gnuradio3_8Minimal.unwrapped.log4cpp + gnuradio3_8Minimal.unwrapped.logLib mpir fftwFloat alsa-lib diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index 02542e503192..1bfb4c74f633 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -49,7 +49,7 @@ gnuradio3_8.pkgs.mkDerivation rec { buildInputs = [ gnuradio3_8.unwrapped.boost codec2 - gnuradio3_8.unwrapped.log4cpp + gnuradio3_8.unwrapped.logLib gmp libpulseaudio libconfig diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 98b8229bc1ae..92abb23a5c57 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -6,7 +6,7 @@ , python , boost , cppunit -, log4cpp +, logLib , osmosdr , gmp , mpir @@ -41,7 +41,7 @@ mkDerivation rec { cppunit osmosdr boost - log4cpp + logLib gmp mpir fftwFloat diff --git a/pkgs/development/gnuradio-modules/grnet/default.nix b/pkgs/development/gnuradio-modules/grnet/default.nix index fc12abd8cfa5..817205cc0ca6 100644 --- a/pkgs/development/gnuradio-modules/grnet/default.nix +++ b/pkgs/development/gnuradio-modules/grnet/default.nix @@ -6,7 +6,7 @@ , cmake , pkg-config , boost -, log4cpp +, logLib , python , swig , mpir @@ -67,7 +67,7 @@ mkDerivation { buildInputs = [ boost - log4cpp + logLib doxygen mpir gmp diff --git a/pkgs/development/gnuradio-modules/gsm/default.nix b/pkgs/development/gnuradio-modules/gsm/default.nix index 835c5456668c..aef853943123 100644 --- a/pkgs/development/gnuradio-modules/gsm/default.nix +++ b/pkgs/development/gnuradio-modules/gsm/default.nix @@ -6,7 +6,7 @@ , cppunit , swig , boost -, log4cpp +, logLib , python , libosmocore , osmosdr @@ -32,7 +32,7 @@ mkDerivation { buildInputs = [ cppunit - log4cpp + logLib boost libosmocore osmosdr diff --git a/pkgs/development/gnuradio-modules/limesdr/default.nix b/pkgs/development/gnuradio-modules/limesdr/default.nix index 48bbc68c80a3..a9ed621cdf11 100644 --- a/pkgs/development/gnuradio-modules/limesdr/default.nix +++ b/pkgs/development/gnuradio-modules/limesdr/default.nix @@ -8,7 +8,7 @@ , doxygen , swig , python -, log4cpp +, logLib , mpir , boost , gmp @@ -42,7 +42,7 @@ in mkDerivation { python ]; buildInputs = [ - log4cpp + logLib mpir boost gmp diff --git a/pkgs/development/gnuradio-modules/nacl/default.nix b/pkgs/development/gnuradio-modules/nacl/default.nix index 1ffb0afee07e..9f9175eae058 100644 --- a/pkgs/development/gnuradio-modules/nacl/default.nix +++ b/pkgs/development/gnuradio-modules/nacl/default.nix @@ -6,7 +6,7 @@ , cppunit , swig , boost -, log4cpp +, logLib , python , libsodium }: @@ -31,7 +31,7 @@ mkDerivation { buildInputs = [ cppunit - log4cpp + logLib boost libsodium ]; diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index a9a47e4d50a4..07a353daa447 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -6,7 +6,7 @@ , gnuradio , cmake , pkg-config -, log4cpp +, logLib , mpir , boost , gmp @@ -44,7 +44,7 @@ in mkDerivation { outputs = [ "out" "dev" ]; buildInputs = [ - log4cpp + logLib mpir boost fftwFloat diff --git a/pkgs/development/gnuradio-modules/rds/default.nix b/pkgs/development/gnuradio-modules/rds/default.nix index 6e651cdd7e0c..7ffdd206474a 100644 --- a/pkgs/development/gnuradio-modules/rds/default.nix +++ b/pkgs/development/gnuradio-modules/rds/default.nix @@ -6,7 +6,7 @@ , pkg-config , swig , python -, log4cpp +, logLib , mpir , thrift , boost @@ -36,7 +36,7 @@ in mkDerivation { disabledForGRafter = "3.9"; buildInputs = [ - log4cpp + logLib mpir boost gmp diff --git a/pkgs/top-level/gnuradio-packages.nix b/pkgs/top-level/gnuradio-packages.nix index 7fc3c4860655..324a061c703e 100644 --- a/pkgs/top-level/gnuradio-packages.nix +++ b/pkgs/top-level/gnuradio-packages.nix @@ -19,15 +19,12 @@ let # Packages that are potentially overridden and used as deps here. boost volk + logLib ; inherit mkDerivationWith mkDerivation; } // lib.optionalAttrs (gnuradio.hasFeature "gr-uhd") { inherit (gnuradio) uhd; - } // (if (lib.versionAtLeast gnuradio.versionAttr.major "3.10") then { - inherit (gnuradio) spdlog; - } else { - inherit (gnuradio) log4cpp; - })); + }); in { inherit callPackage mkDerivation mkDerivationWith; From a1fb8a399cf4248828f6f05d064dba0b0dbc80b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 15 Apr 2023 17:33:54 +0200 Subject: [PATCH 5/6] gnuradioPackages.osmosdr: enable for gnuradio 3.9 and 3.10 Add the latest gr-osmosdr version, 0.2.4, for use with gnuradio 3.9 and 3.10. Add new deps as needed. Closes https://github.com/NixOS/nixpkgs/issues/226296. --- .../development/gnuradio-modules/osmosdr/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/gnuradio-modules/osmosdr/default.nix b/pkgs/development/gnuradio-modules/osmosdr/default.nix index 07a353daa447..18b8229cebcc 100644 --- a/pkgs/development/gnuradio-modules/osmosdr/default.nix +++ b/pkgs/development/gnuradio-modules/osmosdr/default.nix @@ -7,6 +7,7 @@ , cmake , pkg-config , logLib +, libsndfile , mpir , boost , gmp @@ -27,6 +28,8 @@ let version = { "3.7" = "0.1.5"; "3.8" = "0.2.3"; + "3.9" = "0.2.4"; + "3.10" = "0.2.4"; }.${gnuradio.versionAttr.major}; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; @@ -34,12 +37,14 @@ let sha256 = { "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv"; "3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo="; + "3.9" = "sha256-d0hbiJ44lEu8V4XX7JpZVSTQwwykwKPUfiqetRBI6uI="; + "3.10" = "sha256-d0hbiJ44lEu8V4XX7JpZVSTQwwykwKPUfiqetRBI6uI="; }.${gnuradio.versionAttr.major}; }; in mkDerivation { pname = "gr-osmosdr"; inherit version src; - disabledForGRafter = "3.9"; + disabledForGRafter = "3.11"; outputs = [ "out" "dev" ]; @@ -55,11 +60,16 @@ in mkDerivation { libbladeRF rtl-sdr soapysdr-with-plugins + ] ++ lib.optionals (gnuradio.hasFeature "gr-blocks") [ + libsndfile ] ++ lib.optionals (gnuradio.hasFeature "gr-uhd") [ uhd ] ++ lib.optionals (gnuradio.hasFeature "gr-ctrlport") [ thrift python.pkgs.thrift + ] ++ lib.optionals (gnuradio.hasFeature "python-support") [ + python.pkgs.numpy + python.pkgs.pybind11 ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.Security From cf7db74bf4f9bb11137d3639feb3161c1ca173ed Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 15 Apr 2023 19:49:41 +0300 Subject: [PATCH 6/6] gqrx: Use latest gnuradio --- pkgs/applications/radio/gqrx/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 3e3c3f6bef95..e6bcffda2651 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -5,7 +5,7 @@ , qtbase , qtsvg , qtwayland -, gnuradio3_8Minimal +, gnuradioMinimal , thrift , mpir , fftwFloat @@ -25,7 +25,7 @@ assert portaudioSupport -> portaudio != null; # audio backends are mutually exclusive assert !(pulseaudioSupport && portaudioSupport); -gnuradio3_8Minimal.pkgs.mkDerivation rec { +gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; version = "2.15.10"; @@ -43,21 +43,21 @@ gnuradio3_8Minimal.pkgs.mkDerivation rec { wrapGAppsHook ]; buildInputs = [ - gnuradio3_8Minimal.unwrapped.logLib + gnuradioMinimal.unwrapped.logLib mpir fftwFloat alsa-lib libjack2 - gnuradio3_8Minimal.unwrapped.boost + gnuradioMinimal.unwrapped.boost qtbase qtsvg qtwayland - gnuradio3_8Minimal.pkgs.osmosdr + gnuradioMinimal.pkgs.osmosdr rtl-sdr hackrf - ] ++ lib.optionals (gnuradio3_8Minimal.hasFeature "gr-ctrlport") [ + ] ++ lib.optionals (gnuradioMinimal.hasFeature "gr-ctrlport") [ thrift - gnuradio3_8Minimal.unwrapped.python.pkgs.thrift + gnuradioMinimal.unwrapped.python.pkgs.thrift ] ++ lib.optionals pulseaudioSupport [ libpulseaudio ] ++ lib.optionals portaudioSupport [ portaudio ];