From 800db5445db08d59358f05dfd73b4cb10fd4223e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Oct 2023 13:15:25 +0300 Subject: [PATCH 1/3] uhd3_5: remove, unused anymore --- pkgs/applications/radio/uhd/3.5.nix | 160 ---------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 161 deletions(-) delete mode 100644 pkgs/applications/radio/uhd/3.5.nix diff --git a/pkgs/applications/radio/uhd/3.5.nix b/pkgs/applications/radio/uhd/3.5.nix deleted file mode 100644 index 5f34597ea274..000000000000 --- a/pkgs/applications/radio/uhd/3.5.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, cmake -, pkg-config -# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations -, boost -, enableLibuhd_C_api ? true -# requires numpy -, enableLibuhd_Python_api ? false -, python3 -, enableExamples ? false -, enableUtils ? false -, enableLiberio ? false -, liberio -, libusb1 -, enableDpdk ? false -, dpdk -# Devices -, enableOctoClock ? true -, enableMpmd ? true -, enableB100 ? true -, enableB200 ? true -, enableUsrp1 ? true -, enableUsrp2 ? true -, enableX300 ? true -, enableN230 ? true -, enableN300 ? true -, enableN320 ? true -, enableE300 ? true -, enableE320 ? true -}: - -let - onOffBool = b: if b then "ON" else "OFF"; - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { - pname = "uhd"; - # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.15.0.0"; - - src = fetchFromGitHub { - owner = "EttusResearch"; - repo = "uhd"; - rev = "v${version}"; - sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf"; - }; - # Firmware images are downloaded (pre-built) from the respective release on Github - uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; - sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; - }; - - cmakeFlags = [ - "-DENABLE_LIBUHD=ON" - "-DENABLE_USB=ON" - "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases - "-DENABLE_EXAMPLES=${onOffBool enableExamples}" - "-DENABLE_UTILS=${onOffBool enableUtils}" - "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}" - "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}" - "-DENABLE_LIBERIO=${onOffBool enableLiberio}" - "-DENABLE_DPDK=${onOffBool enableDpdk}" - # Devices - "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" - "-DENABLE_MPMD=${onOffBool enableMpmd}" - "-DENABLE_B100=${onOffBool enableB100}" - "-DENABLE_B200=${onOffBool enableB200}" - "-DENABLE_USRP1=${onOffBool enableUsrp1}" - "-DENABLE_USRP2=${onOffBool enableUsrp2}" - "-DENABLE_X300=${onOffBool enableX300}" - "-DENABLE_N230=${onOffBool enableN230}" - "-DENABLE_N300=${onOffBool enableN300}" - "-DENABLE_N320=${onOffBool enableN320}" - "-DENABLE_E300=${onOffBool enableE300}" - "-DENABLE_E320=${onOffBool enableE320}" - ] - # TODO: Check if this still needed - # ABI differences GCC 7.1 - # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 - ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] - ; - - # Python + mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ mako ] - ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] - ++ optionals (enableUtils) [ requests six ] - ); - - nativeBuildInputs = [ - cmake - pkg-config - ] - # If both enableLibuhd_Python_api and enableUtils are off, we don't need - # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime - # dependency - ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ] - ; - buildInputs = [ - boost - libusb1 - ] - # However, if enableLibuhd_Python_api *or* enableUtils is on, we need - # pythonEnv for runtime as well. The utilities' runtime dependencies are - # handled at the environment - ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ] - ++ optionals (enableLiberio) [ liberio ] - ++ optionals (enableDpdk) [ dpdk ] - ; - - doCheck = true; - - # Build only the host software - preConfigure = "cd host"; - # TODO: Check if this still needed, perhaps relevant: - # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm - patches = if stdenv.isAarch32 then ./neon.patch else null; - - postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils) [ "moveUdevRules" ] - ; - - # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` - installFirmware = '' - mkdir -p "$out/share/uhd/images" - tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" - ''; - - # -DENABLE_TESTS=ON installs the tests, we don't need them in the output - removeInstalledTests = '' - rm -r $out/lib/uhd/tests - ''; - - # Moves the udev rules to the standard location, needed only if utils are - # enabled - moveUdevRules = '' - mkdir -p $out/lib/udev/rules.d - mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ - ''; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - description = "USRP Hardware Driver (for Software Defined Radio)"; - longDescription = '' - The USRP Hardware Driver (UHD) software is the hardware driver for all - USRP (Universal Software Radio Peripheral) devices. - - USRP devices are designed and sold by Ettus Research, LLC and its parent - company, National Instruments. - ''; - homepage = "https://uhd.ettus.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz tomberek ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 21abae867566..8831f69b60c0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -816,6 +816,7 @@ mapAliases ({ uade123 = uade; # Added 2022-07-30 uberwriter = apostrophe; # Added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21 + uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07 uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21 unicorn-emu = unicorn; # Added 2020-10-29 uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 600517900c39..c8cc1eda9dc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20508,7 +20508,6 @@ with pkgs; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; - uhd3_5 = callPackage ../applications/radio/uhd/3.5.nix { }; uhd = callPackage ../applications/radio/uhd { }; uisp = callPackage ../development/embedded/uisp { }; From bae9a9cc4edf47c6397734087bc3705c844f5155 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Oct 2023 13:07:29 +0300 Subject: [PATCH 2/3] uhd: Improve comments near disabled features --- pkgs/applications/radio/uhd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 23c0a7285868..e85000d4f9d2 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -8,13 +8,19 @@ , boost , ncurses , enableCApi ? true -# requires numpy +# Although we handle the Python API's dependencies in pythonEnvArg, this +# feature is currently disabled as upstream attempts to run `python setup.py +# install` by itself, and it fails because the Python's environment's prefix is +# not a writable directly. Adding support for this feature would require using +# python's pypa/build nad pypa/install hooks directly, and currently it is hard +# to do that because it all happens after a long buildPhase of the C API. , enablePythonApi ? false , python3 , buildPackages , enableExamples ? false , enableUtils ? false , libusb1 +# Disable dpdk for now due to compilation issues. , enableDpdk ? false , dpdk # Devices From 2c9957e42f2e451612119a1b03216578d639e754 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 Oct 2023 13:13:21 +0300 Subject: [PATCH 3/3] uhd: build with utils by default Build the uhd package with utils enabled by default, and disallow it to retain python references if these features are disabled. Add a new package uhdMinimal which does not build with these features. Modify the gnuradio{,3_{8,9}}Minimal packages so that they use the uhd package without python references. --- pkgs/applications/radio/uhd/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index e85000d4f9d2..5dbed65484de 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -18,7 +18,7 @@ , python3 , buildPackages , enableExamples ? false -, enableUtils ? false +, enableUtils ? true , libusb1 # Disable dpdk for now due to compilation issues. , enableDpdk ? false @@ -150,6 +150,10 @@ stdenv.mkDerivation (finalAttrs: { mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ ''; + disallowedReferences = optionals (!enablePythonApi && !enableUtils) [ + python3 + ]; + meta = with lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8cc1eda9dc8..7f2141e89aa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20509,6 +20509,10 @@ with pkgs; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; uhd = callPackage ../applications/radio/uhd { }; + uhdMinimal = uhd.override { + enableUtils = false; + enablePythonApi = false; + }; uisp = callPackage ../development/embedded/uisp { }; @@ -31843,6 +31847,7 @@ with pkgs; # So it will not reference python enableModTool = false; }; + uhd = uhdMinimal; features = { gnuradio-companion = false; python-support = false; @@ -31875,6 +31880,7 @@ with pkgs; # So it will not reference python enableModTool = false; }; + uhd = uhdMinimal; features = { gnuradio-companion = false; python-support = false; @@ -31906,6 +31912,7 @@ with pkgs; volk = volk.override { enableModTool = false; }; + uhd = uhdMinimal; features = { gnuradio-companion = false; python-support = false;