public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34434 from markuskowa/uhd-fix-boost-pr

Browse Source 
uhd: 3.10.2.0 -> 3.10.3.0
This commit is contained in:
Franz Pletz 2018-02-09 18:33:11 +00:00 committed by GitHub
commit a51cda85ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/tools/misc/uhd/default.nix
View File

@ -7,18 +7,29 @@
# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666"
# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666"
stdenv.mkDerivation rec { let
name = "uhd-${version}"; uhdVer = "003_010_003_000";
version = "3.10.2.0"; ImgVer = stdenv.lib.replaceStrings ["_"] ["."] uhdVer;
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... # and xxx.yyy.zzz. Hrmpf...
version = "3.10.3.0";
# Firmware images are downloaded (pre-built) from:
# http://files.ettus.com/binaries/images/
uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/images/uhd-images_${ImgVer}-release.tar.gz";
sha256 = "198awvw6zsh19ydgx5qry5yc6yahdval9wjrsqbyj51pnr6s5qvy";
};
in stdenv.mkDerivation {
name = "uhd-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EttusResearch"; owner = "EttusResearch";
repo = "uhd"; repo = "uhd";
rev = "release_003_010_002_000"; rev = "release_${uhdVer}";
sha256 = "0g6f4amw7h0vr6faa1nc1zs3bc645binza0zqqx5cwgfxybv8cfy"; sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -31,13 +42,6 @@ stdenv.mkDerivation rec {
# Build only the host software # Build only the host software
preConfigure = "cd host"; preConfigure = "cd host";
# Firmware images are downloaded (pre-built)
uhdImagesName = "uhd-images_003.007.003-release";
uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz";
sha256 = "1pv5c5902041494z0jfw623ca29pvylrw5klybbhklvn5wwlr6cv";
};
postPhases = [ "installFirmware" ]; postPhases = [ "installFirmware" ];
installFirmware = '' installFirmware = ''

4
pkgs/top-level/all-packages.nix
View File

@ -8003,9 +8003,7 @@ with pkgs;
tweak = callPackage ../applications/editors/tweak { }; tweak = callPackage ../applications/editors/tweak { };
uhd = callPackage ../development/tools/misc/uhd { uhd = callPackage ../development/tools/misc/uhd { };
boost = boost165;
};
uisp = callPackage ../development/tools/misc/uisp { }; uisp = callPackage ../development/tools/misc/uisp { };