uhd: 3.10.2.0 -> 3.10.3.0 #34434
Merged
uhd: 3.10.2.0 -> 3.10.3.0 #34434
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Looks good! Only thing is the From e42c827e2a7bb212ee0ac17e2d082734806a92f5 Mon Sep 17 00:00:00 2001
From: Luke Adams <luke.adams@belljar.io>
Date: Thu, 1 Feb 2018 11:52:16 -0600
Subject: [PATCH] bump uhd images version
---
pkgs/development/tools/misc/uhd/default.nix | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index 8f7ef254cf8..25796561f71 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "EttusResearch";
repo = "uhd";
- rev = "release_003_010_003_000";
+ rev = "release_003_010_003_000"; # Also bump `uhdImagesName` below
sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3";
};
@@ -31,11 +31,12 @@ stdenv.mkDerivation rec {
# Build only the host software
preConfigure = "cd host";
- # Firmware images are downloaded (pre-built)
- uhdImagesName = "uhd-images_003.007.003-release";
+ # Firmware images are downloaded (pre-built) from:
+ # http://files.ettus.com/binaries/images/
+ uhdImagesName = "uhd-images_003.010.003.000-release";
uhdImagesSrc = fetchurl {
- url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz";
- sha256 = "1pv5c5902041494z0jfw623ca29pvylrw5klybbhklvn5wwlr6cv";
+ url = "http://files.ettus.com/binaries/images/${uhdImagesName}.tar.gz";
+ sha256 = "198awvw6zsh19ydgx5qry5yc6yahdval9wjrsqbyj51pnr6s5qvy";
};
postPhases = [ "installFirmware" ];
--
2.15.1May be helpful to add the following to prevent this issue in the future: let
uhdVer = "003_010_003_000";
in
...
src = fetchFromGitHub {
rev = "release_${uhdVer}";
...
uhdImagesName = "uhd-images_${lib.replaceStrings ["_"] ["."] uhdVer}-release";Or wherabouts |
|
Thanks for the patch. The fw version and the host tools version are now locked to each other. |
|
Awesome! I got emailed about 9c6a17c since you referenced it in your issue. I need to test this weekend but pinning the boost version may cause gnuradio building to fail as it uses latest boost. If so this pr may want to revert that commit? |
thanks to lukeadams for the patch
|
Hydra can build gnuradio again with pinning boost to 1.65 (https://hydra.nixos.org/build/68382505). I will rebase this PR and revert it back to default boost version (1.66), since nox-review could build it successfully. CC @fpletz |
markuskowa
force-pushed
the
uhd-fix-boost-pr
branch
from
871f646
to
d251a4b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Version update. Includes fix to build against boost 1.66 (see #33549 and #33552)
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)