ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

uhd: 3.7.0 -> 3.9.3

Browse Source
This commit is contained in:
Franz Pletz 2016-03-22 01:15:40 +01:00
parent c0a35241f0
commit b2f92582fb
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
{ stdenv, fetchurl, cmake, pkgconfig, python, cheetahTemplate, orc, libusb1, boost }: { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig
, python, pythonPackages, orc, libusb1, boost }:
# You need these udev rules to not have to run as root (copied from # You need these udev rules to not have to run as root (copied from
# ${uhd}/share/uhd/utils/uhd-usrp.rules): # ${uhd}/share/uhd/utils/uhd-usrp.rules):
@ -8,29 +9,33 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "uhd-${version}"; name = "uhd-${version}";
version = "3.7.0"; version = "3.9.3";
# 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...
src = fetchurl { src = fetchFromGitHub {
name = "${name}.tar.gz"; owner = "EttusResearch";
url = "https://github.com/EttusResearch/uhd/archive/release_003_007_000.tar.gz"; repo = "uhd";
sha256 = "0x9imfy63s6wlbilr2n82c15nd33ix0mbap0q1xwh2pj1mk4d5jk"; rev = "release_003_009_003";
sha256 = "0nbm8nrjd0l8jj1wq0kkgd8pifzysdyc7pvraq16m0dc01mr638h";
}; };
enableParallelBuilding = true;
cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0"; cmakeFlags = "-DLIBUSB_INCLUDE_DIRS=${libusb1}/include/libusb-1.0";
buildInputs = [ cmake pkgconfig python cheetahTemplate orc libusb1 boost ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ];
# Build only the host software # Build only the host software
preConfigure = "cd host"; preConfigure = "cd host";
# Firmware images are downloaded (pre-built) # Firmware images are downloaded (pre-built)
uhdImagesName = "uhd-images_003.007.000-release"; uhdImagesName = "uhd-images_003.007.003-release";
uhdImagesSrc = fetchurl { uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz"; url = "http://files.ettus.com/binaries/maint_images/archive/${uhdImagesName}.tar.gz";
sha256 = "0vb0rc5ji8n6l6ycvd7pbazxzm0ihvkmqm77jflqrd3kky8r722d"; sha256 = "1pv5c5902041494z0jfw623ca29pvylrw5klybbhklvn5wwlr6cv";
}; };
postPhases = [ "installFirmware" ]; postPhases = [ "installFirmware" ];
@ -51,6 +56,6 @@ stdenv.mkDerivation rec {
homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki; homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ]; maintainers = with maintainers; [ bjornfor fpletz ];
}; };
} }

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

@ -6328,9 +6328,7 @@ let
texi2html = callPackage ../development/tools/misc/texi2html { }; texi2html = callPackage ../development/tools/misc/texi2html { };
uhd = callPackage ../development/tools/misc/uhd { uhd = callPackage ../development/tools/misc/uhd { };
boost = boost155;
};
uisp = callPackage ../development/tools/misc/uisp { }; uisp = callPackage ../development/tools/misc/uisp { };