diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-02-09 18:33:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 18:33:11 +0000 |
| commit | a51cda85ff30876b71fee87b1eef4409af6d4277 (patch) | |
| tree | 5923c23d9f73b7474d27d14373802ad0acf1884e | |
| parent | 209f8b1acd4c855d223d93f02caf3ccf6cec7e32 (diff) | |
| parent | d251a4b40b0eeb96007ab2027e7499fde7c217b6 (diff) | |
| download | nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.tar nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.tar.gz nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.tar.bz2 nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.tar.lz nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.tar.xz nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.tar.zst nixlib-a51cda85ff30876b71fee87b1eef4409af6d4277.zip | |
Merge pull request #34434 from markuskowa/uhd-fix-boost-pr
uhd: 3.10.2.0 -> 3.10.3.0
| -rw-r--r-- | pkgs/development/tools/misc/uhd/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix index 8212eccc6d13..78195e994c94 100644 --- a/pkgs/development/tools/misc/uhd/default.nix +++ b/pkgs/development/tools/misc/uhd/default.nix @@ -7,18 +7,29 @@ # SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" # SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" -stdenv.mkDerivation rec { - name = "uhd-${version}"; - version = "3.10.2.0"; +let + uhdVer = "003_010_003_000"; + ImgVer = stdenv.lib.replaceStrings ["_"] ["."] uhdVer; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # 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 { owner = "EttusResearch"; repo = "uhd"; - rev = "release_003_010_002_000"; - sha256 = "0g6f4amw7h0vr6faa1nc1zs3bc645binza0zqqx5cwgfxybv8cfy"; + rev = "release_${uhdVer}"; + sha256 = "1aj8qizbyz4shwawj3qlhl6pyyda59hhgm9cwrj7s5kfdi4vdlc3"; }; enableParallelBuilding = true; @@ -31,13 +42,6 @@ stdenv.mkDerivation rec { # Build only the host software 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" ]; installFirmware = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c09a3843e263..fb9bcac35189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8003,9 +8003,7 @@ with pkgs; tweak = callPackage ../applications/editors/tweak { }; - uhd = callPackage ../development/tools/misc/uhd { - boost = boost165; - }; + uhd = callPackage ../development/tools/misc/uhd { }; uisp = callPackage ../development/tools/misc/uisp { }; |