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

Merge pull request #41431 from lukeadams/gr-update

Browse Source 
gnuradio: 3.7.11.1 -> 3.7.13.3
This commit is contained in:
Matthew Bauer
2018-06-28 20:42:04 -04:00
committed by GitHub
parent 76d1e13b7a 695c1fcd76
commit aea65fe799
5 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/libbladeRF/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, tecla
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla
, libusb1, udev }:
stdenv.mkDerivation rec {
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake git doxygen help2man tecla libusb1 udev ];
# ncurses used due to https://github.com/Nuand/bladeRF/blob/ab4fc672c8bab4f8be34e8917d3f241b1d52d0b8/host/utilities/bladeRF-cli/CMakeLists.txt#L208
buildInputs = [ cmake git doxygen help2man tecla libusb1 ]
++ lib.optionals stdenv.isLinux [ udev ]
++ lib.optionals stdenv.isDarwin [ ncurses ];
# Fixup shebang
prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
@@ -24,17 +27,19 @@ stdenv.mkDerivation rec {
'';
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Debug"
"-DBUILD_DOCUMENTATION=ON"
] ++ lib.optionals stdenv.isLinux [
"-DUDEV_RULES_PATH=etc/udev/rules.d"
"-DINSTALL_UDEV_RULES=ON"
"-DBUILD_DOCUMENTATION=ON"
];
meta = with stdenv.lib; {
homepage = https://www.nuand.com/;
hardeningDisable = [ "fortify" ];
meta = with lib; {
homepage = https://nuand.com/libbladeRF-doc;
description = "Supporting library of the BladeRF SDR opensource hardware";
license = licenses.lgpl21;
maintainers = with maintainers; [ funfunctor ];
platforms = with platforms; linux;
platforms = platforms.unix;
};
}

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

@@ -9,17 +9,15 @@
let
uhdVer = "v" + version;
ImgVer = "uhd-images_3.11.0.git-227-g9277fc58.tar.xz";
# UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing
version = "3.11.0.0";
version = "3.12.0.0";
# Firmware images are downloaded (pre-built) from:
# http://files.ettus.com/binaries/images/
# Firmware images are downloaded (pre-built) from the respective release on Github
uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/images/${ImgVer}";
sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z";
url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p";
};
in stdenv.mkDerivation {
@@ -29,7 +27,7 @@ in stdenv.mkDerivation {
owner = "EttusResearch";
repo = "uhd";
rev = "${uhdVer}";
sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q";
sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv";
};
enableParallelBuilding = true;
@@ -49,8 +47,10 @@ in stdenv.mkDerivation {
postPhases = [ "installFirmware" ];
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
installFirmware = ''
tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out"
mkdir -p "$out/share/uhd/images"
tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images"
'';
meta = with stdenv.lib; {