Commit 1af589bc authored by Steven Kou's avatar Steven Kou Committed by Doron Behar
Browse files

uhd: 4.6.0.0 -> 4.7.0.0

parent 0065f778

pkgs/applications/radio/uhd/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { 
  #

  #     nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true

  #

  version = "4.6.0.0";

  version = "4.7.0.0";



  outputs = [ "out" "dev" ];
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { 
    rev = "v${finalAttrs.version}";

    # The updateScript relies on the `src` using `hash`, and not `sha256. To

    # update the correct hash for the `src` vs the `uhdImagesSrc`

    hash = "sha256-9ZGt0ZrGbprCmpAuOue6pg2gliu4MvlRFHGxyMJeKAc=";

    hash = "sha256-TX1iLs941z8sZY0yQEXuy9jGgsn6HU4uqIdxJmNNahU=";

  };

  # Firmware images are downloaded (pre-built) from the respective release on Github

  uhdImagesSrc = fetchurl {

pkgs/applications/radio/uhd/no-adapter-tests.patch

+8 −8
Original line number Diff line number Diff line 
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(

index bac599811..267f8e602 100644

--- a/host/tests/CMakeLists.txt

+++ b/host/tests/CMakeLists.txt

@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST(

     ${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp

 )
@@ -12,6 +12,6 @@ index f40c252ad..b8a07d341 100644 
-    ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp

-)

-

 ########################################################################

 # demo of a loadable module

 ########################################################################
 
 UHD_ADD_NONAPI_TEST(

     TARGET "custom_reg_test.cpp"

     EXTRA_SOURCES