diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-06 16:55:14 +0000 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-03-06 16:55:14 +0000 |
| commit | bcf6c81a88b0569f4e646dd7c8f59311238df831 (patch) | |
| tree | b3678d169392306354120b2d7cf68e82a8b0bc6c /pkgs/applications/radio/uhd | |
| parent | 4ccac6fd237eceb85e3f03ff78128198796b7e90 (diff) | |
| parent | 1cd0291434dc359c808664d774adfae539f458f7 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/radio/uhd')
| -rw-r--r-- | pkgs/applications/radio/uhd/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/radio/uhd/no-adapter-tests.patch | 17 |
2 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index a7b88707eb2ab..812b9cf6a9bd7 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -39,7 +39,7 @@ 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 = "4.1.0.5"; + version = "4.4.0.0"; outputs = [ "out" "dev" ]; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { owner = "EttusResearch"; repo = "uhd"; rev = "v${version}"; - sha256 = "sha256-XBq4GkLRR2SFunFRvpPOMiIbTuUkMYf8tPAoHCoveRA="; + sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; }; # 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 = "HctHB90ikOMkrYNyWmjGE/2HvA7xXKCUezdtiqzN+1A="; + sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; }; cmakeFlags = [ @@ -116,7 +116,12 @@ stdenv.mkDerivation rec { 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; + patches = [ + # Disable tests that fail in the sandbox + ./no-adapter-tests.patch + ] ++ lib.optionals stdenv.isAarch32 [ + ./neon.patch + ]; postPhases = [ "installFirmware" "removeInstalledTests" ] ++ optionals (enableUtils) [ "moveUdevRules" ] diff --git a/pkgs/applications/radio/uhd/no-adapter-tests.patch b/pkgs/applications/radio/uhd/no-adapter-tests.patch new file mode 100644 index 0000000000000..38865f418101c --- /dev/null +++ b/pkgs/applications/radio/uhd/no-adapter-tests.patch @@ -0,0 +1,17 @@ +diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt +index f40c252ad..b8a07d341 100644 +--- i/host/tests/CMakeLists.txt ++++ w/host/tests/CMakeLists.txt +@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST( + ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp + ) + +-UHD_ADD_NONAPI_TEST( +- TARGET "xport_adapter_ctrl_test.cpp" +- EXTRA_SOURCES +- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp +-) +- + ######################################################################## + # demo of a loadable module + ######################################################################## |