mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
uhd: 4.6.0.0 -> 4.7.0.0
This commit is contained in:
parent
0065f77875
commit
1af589bc44
@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
#
|
#
|
||||||
# nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true
|
# 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" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
rev = "v${finalAttrs.version}";
|
rev = "v${finalAttrs.version}";
|
||||||
# The updateScript relies on the `src` using `hash`, and not `sha256. To
|
# The updateScript relies on the `src` using `hash`, and not `sha256. To
|
||||||
# update the correct hash for the `src` vs the `uhdImagesSrc`
|
# 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
|
# Firmware images are downloaded (pre-built) from the respective release on Github
|
||||||
uhdImagesSrc = fetchurl {
|
uhdImagesSrc = fetchurl {
|
||||||
|
@ -1,17 +1,17 @@
|
|||||||
diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt
|
diff --git i/host/tests/CMakeLists.txt w/host/tests/CMakeLists.txt
|
||||||
index f40c252ad..b8a07d341 100644
|
index bac599811..267f8e602 100644
|
||||||
--- i/host/tests/CMakeLists.txt
|
--- a/host/tests/CMakeLists.txt
|
||||||
+++ w/host/tests/CMakeLists.txt
|
+++ b/host/tests/CMakeLists.txt
|
||||||
@@ -453,12 +453,6 @@ UHD_ADD_NONAPI_TEST(
|
@@ -517,12 +517,6 @@ UHD_ADD_NONAPI_TEST(
|
||||||
${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
|
${UHD_SOURCE_DIR}/lib/utils/compat_check.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
-UHD_ADD_NONAPI_TEST(
|
-UHD_ADD_NONAPI_TEST(
|
||||||
- TARGET "xport_adapter_ctrl_test.cpp"
|
- TARGET "xport_adapter_ctrl_test.cpp"
|
||||||
- EXTRA_SOURCES
|
- EXTRA_SOURCES
|
||||||
- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp
|
- ${UHD_SOURCE_DIR}/lib/usrp/cores/xport_adapter_ctrl.cpp
|
||||||
-)
|
-)
|
||||||
-
|
-
|
||||||
########################################################################
|
UHD_ADD_NONAPI_TEST(
|
||||||
# demo of a loadable module
|
TARGET "custom_reg_test.cpp"
|
||||||
########################################################################
|
EXTRA_SOURCES
|
||||||
|
Loading…
Reference in New Issue
Block a user