From 73e51641441ed020f91923f54d5b3d868aee64eb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 14:06:14 +0200 Subject: [PATCH 1/9] uhd: 3.14.0.0 -> 3.15.0.0 Use rec instead of let in and use only 1 version attribute. --- pkgs/applications/radio/uhd/default.nix | 26 ++++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 76519062f59043..bf85ac51291477 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -7,28 +7,22 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" -let - uhdVer = "v" + version; - +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.14.0.0"; - - # Firmware images are downloaded (pre-built) from the respective release on Github - uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; - sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0"; - }; - -in stdenv.mkDerivation { - pname = "uhd"; - inherit version; + version = "3.15.0.0"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = uhdVer; - sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; + 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"; }; enableParallelBuilding = true; From 246dc9871ca0fd4bb2aaf9726279b1948520af6e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 14:16:25 +0200 Subject: [PATCH 2/9] uhd: format arguments and inputs --- pkgs/applications/radio/uhd/default.nix | 29 ++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index bf85ac51291477..76726012b68cbe 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,5 +1,13 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, python, orc, libusb1, boost }: +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkgconfig +, python +, orc +, libusb1 +, boost +}: # You need these udev rules to not have to run as root (copied from # ${uhd}/share/uhd/utils/uhd-usrp.rules): @@ -27,13 +35,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # 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 + cmakeFlags = [ + "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0" + ] + # 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 + ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] + ; - cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; - - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; buildInputs = [ (python.withPackages (ps: with ps; [ Mako six requests ])) orc From 66d74e0d2d78b626aa14970726e42b02a4cc9f72 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 14:31:30 +0200 Subject: [PATCH 3/9] uhd: remove and add TODO for old build fixes --- pkgs/applications/radio/uhd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 76726012b68cbe..d289e7e3c71acd 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0" ] + # 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 ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { # 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" ]; From c9fb957065dc2253d5b90a602639aecb293087e9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 15:41:01 +0200 Subject: [PATCH 4/9] uhd: Remove orc unneeded dep --- pkgs/applications/radio/uhd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index d289e7e3c71acd..1fcb0e28031f8a 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -4,7 +4,6 @@ , cmake , pkgconfig , python -, orc , libusb1 , boost }: @@ -49,7 +48,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ (python.withPackages (ps: with ps; [ Mako six requests ])) - orc libusb1 boost ]; From 5487216a52455dfa5ea248ee23d1a0dc835a8e7e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 15:41:35 +0200 Subject: [PATCH 5/9] uhd: Remove python six and requests unneeded deps (tested) --- pkgs/applications/radio/uhd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 1fcb0e28031f8a..ffc28c3480f047 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -45,9 +45,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig + # Python + Mako are always required for the build itself but not necessary for runtime + (python.withPackages (ps: with ps; [ Mako ])) ]; buildInputs = [ - (python.withPackages (ps: with ps; [ Mako six requests ])) libusb1 boost ]; From 7d708425aa3ce4b781cd81a1c90499ba65d7e99a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 17:21:20 +0200 Subject: [PATCH 6/9] uhd: cleanup deps & add many enable / disable flags --- pkgs/applications/radio/uhd/default.nix | 89 ++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index ffc28c3480f047..291c1628753115 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -3,9 +3,32 @@ , fetchFromGitHub , cmake , pkgconfig -, python -, libusb1 +# 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 +, python ? null +, enableExamples ? false +, enableUtils ? false +, enableLiberio ? false +, liberio ? null +, libusb1 ? null +, enableDpdk ? false +, dpdk ? null +# 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 }: # You need these udev rules to not have to run as root (copied from @@ -14,6 +37,11 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" +let + onOffBool = b: if b then "ON" else "OFF"; + inherit (stdenv.lib) optionals; +in + stdenv.mkDerivation rec { pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz @@ -35,6 +63,28 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; 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 @@ -42,16 +92,34 @@ stdenv.mkDerivation rec { ++ [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] ; + # Python + Mako are always required for the build itself but not necessary for runtime. + pythonEnv = python.withPackages (ps: with ps; [ Mako ] + ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] + ++ optionals (enableUtils) [ requests six ] + ); + nativeBuildInputs = [ cmake pkgconfig - # Python + Mako are always required for the build itself but not necessary for runtime - (python.withPackages (ps: with ps; [ Mako ])) - ]; + ] + # 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 = [ - libusb1 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"; @@ -59,7 +127,7 @@ stdenv.mkDerivation rec { # 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" ]; + postPhases = [ "installFirmware" "removeInstalledTests" ]; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -67,6 +135,11 @@ stdenv.mkDerivation rec { 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 + ''; + meta = with stdenv.lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' From 8c2ae7d019899f7d17cdaf3e1fd267247c815a10 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 18:30:33 +0200 Subject: [PATCH 7/9] uhd: move udev rules to the standard location --- pkgs/applications/radio/uhd/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 291c1628753115..91e28977f6f993 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -31,12 +31,6 @@ , enableE320 ? true }: -# You need these udev rules to not have to run as root (copied from -# ${uhd}/share/uhd/utils/uhd-usrp.rules): -# -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" - let onOffBool = b: if b then "ON" else "OFF"; inherit (stdenv.lib) optionals; @@ -127,7 +121,9 @@ stdenv.mkDerivation rec { # 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" ]; + postPhases = [ "installFirmware" "removeInstalledTests" ] + ++ optionals (enableUtils) [ "moveUdevRules" ] + ; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -140,6 +136,13 @@ stdenv.mkDerivation rec { 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 stdenv.lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' From 366e8001e59425dfa1ef8591565f4338c816619c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 9 Mar 2020 18:57:08 +0200 Subject: [PATCH 8/9] uhd: switch to python3 by default --- pkgs/applications/radio/uhd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 91e28977f6f993..20dec9ef28511c 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -8,7 +8,7 @@ , enableLibuhd_C_api ? true # requires numpy , enableLibuhd_Python_api ? false -, python ? null +, python3 ? null , enableExamples ? false , enableUtils ? false , enableLiberio ? false @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ; # Python + Mako are always required for the build itself but not necessary for runtime. - pythonEnv = python.withPackages (ps: with ps; [ Mako ] + pythonEnv = python3.withPackages (ps: with ps; [ Mako ] ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] ++ optionals (enableUtils) [ requests six ] ); From 2c8d2d56d6a033b74b3fdb2b6bee3ddce221ea90 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 3 Apr 2020 14:55:06 +0300 Subject: [PATCH 9/9] uhd: quote homepage URL --- pkgs/applications/radio/uhd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 20dec9ef28511c..e7ddb5787fac47 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { USRP devices are designed and sold by Ettus Research, LLC and its parent company, National Instruments. ''; - homepage = https://uhd.ettus.com/; + homepage = "https://uhd.ettus.com/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz tomberek ];