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
commit aea65fe799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/gnuradio/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, writeText, makeWrapper { stdenv, fetchFromGitHub, writeText, makeWrapper
# Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html # Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html
# => core dependencies # => core dependencies
, cmake, pkgconfig, git, boost, cppunit, fftw , ninja, cmake, pkgconfig, git, boost, cppunit, fftw
# => python wrappers # => python wrappers
# May be able to upgrade to swig3 # May be able to upgrade to swig3
, python, swig2, numpy, scipy, matplotlib , python, swig2, numpy, scipy, matplotlib
# => grc - the gnu radio companion # => grc - the gnu radio companion
, cheetah, pygtk , Mako, cheetah, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8
# => gr-wavelet: collection of wavelet blocks # => gr-wavelet: collection of wavelet blocks
, gsl , gsl
# => gr-qtgui: the Qt-based GUI # => gr-qtgui: the Qt-based GUI
@ -26,18 +26,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnuradio-${version}"; name = "gnuradio-${version}";
version = "3.7.11.1"; version = "3.7.13.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gnuradio"; owner = "gnuradio";
repo = "gnuradio"; repo = "gnuradio";
rev = "6d2221196082a4954c249dc6955e33d5832a56f2"; rev = "v${version}";
sha256 = "1fkrb8cnjbriy2x94lz73q6aqxar1rkvfbafp266ykdpm29b4xgm"; sha256 = "0fqxn1k41xqd52i5z528zdhkn52i9z5hl6cc75ggdx9iqxhvb3jj";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake pkgconfig git makeWrapper cppunit orc cmake pkgconfig git makeWrapper cppunit orc ninja
]; ];
buildInputs = [ buildInputs = [
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -69,6 +69,8 @@ stdenv.mkDerivation rec {
setupHook = [ grcSetupHook ]; setupHook = [ grcSetupHook ];
# patch wxgui and pygtk check due to python importerror in a headless environment # patch wxgui and pygtk check due to python importerror in a headless environment
# wxgtk gui will be removed in GR3.8
# c++11 hack may not be necessary anymore
preConfigure = '' preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}"
sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt

10
pkgs/applications/misc/rtl-sdr/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, cmake, pkgconfig, libusb1 }: { stdenv, lib, fetchpatch, fetchgit, cmake, pkgconfig, libusb1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rtl-sdr-${version}"; name = "rtl-sdr-${version}";
@ -26,7 +26,13 @@ stdenv.mkDerivation rec {
grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; } grep -q "Requires:" "$pcfile" && { echo "Upstream has added 'Requires:' in $(basename "$pcfile"); update nix expression."; exit 1; }
echo "Requires: libusb-1.0" >> "$pcfile" echo "Requires: libusb-1.0" >> "$pcfile"
''; '';
patches = lib.optionals stdenv.isDarwin [
(fetchpatch {
name = "linker-fix.patch";
url = "https://github.com/lukeadams/rtl-sdr/commit/7a66dcf268305b5aa507d1756799942c74549b72.patch";
sha256 = "0cn9fyf4ay4i3shvxj1ivgyxjvfm401irk560jdjl594nzadrcsl";
})
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver";
homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr;

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 }: , libusb1, udev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; 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 # Fixup shebang
prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash";
@ -24,17 +27,19 @@ stdenv.mkDerivation rec {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Debug" "-DBUILD_DOCUMENTATION=ON"
] ++ lib.optionals stdenv.isLinux [
"-DUDEV_RULES_PATH=etc/udev/rules.d" "-DUDEV_RULES_PATH=etc/udev/rules.d"
"-DINSTALL_UDEV_RULES=ON" "-DINSTALL_UDEV_RULES=ON"
"-DBUILD_DOCUMENTATION=ON"
]; ];
meta = with stdenv.lib; { hardeningDisable = [ "fortify" ];
homepage = https://www.nuand.com/;
meta = with lib; {
homepage = https://nuand.com/libbladeRF-doc;
description = "Supporting library of the BladeRF SDR opensource hardware"; description = "Supporting library of the BladeRF SDR opensource hardware";
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = with maintainers; [ funfunctor ]; 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 let
uhdVer = "v" + version; 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 # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
# and xxx.yyy.zzz. Hrmpf... style keeps changing # 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: # Firmware images are downloaded (pre-built) from the respective release on Github
# http://files.ettus.com/binaries/images/
uhdImagesSrc = fetchurl { uhdImagesSrc = fetchurl {
url = "http://files.ettus.com/binaries/images/${ImgVer}"; url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz";
sha256 = "1z8isnlxc5h0168jjpdvdv7rkd55x4dkfh14m8pc501zsf8azd6z"; sha256 = "1glf2qay4asajbl92fy432idqk0sj5h603najr8sgkbdyyyr933p";
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
@ -29,7 +27,7 @@ in stdenv.mkDerivation {
owner = "EttusResearch"; owner = "EttusResearch";
repo = "uhd"; repo = "uhd";
rev = "${uhdVer}"; rev = "${uhdVer}";
sha256 = "1ilx1a8k5zygfq7acm9yk2fi368b1a1l7ll21kmmxjv6ifz8ds5q"; sha256 = "0m7vw7dmvn7d01kkzphayzi0bk50m5v9a17rpnxhn0bqhw282ksv";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -49,8 +47,10 @@ in stdenv.mkDerivation {
postPhases = [ "installFirmware" ]; postPhases = [ "installFirmware" ];
# UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images`
installFirmware = '' 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; { meta = with stdenv.lib; {

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

@ -15946,7 +15946,7 @@ with pkgs;
gnss-sdr = callPackage ../applications/misc/gnss-sdr { }; gnss-sdr = callPackage ../applications/misc/gnss-sdr { };
gnuradio = callPackage ../applications/misc/gnuradio { gnuradio = callPackage ../applications/misc/gnuradio {
inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;
fftw = fftwFloat; fftw = fftwFloat;
qwt = qwt6_qt4; qwt = qwt6_qt4;