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

gnuradio: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk 2016-10-18 17:53:31 +02:00
parent 216a906ed1
commit 0c82702f66
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
# python wrappers # python wrappers
, python, swig2, numpy, scipy, matplotlib , python, swig2, numpy, scipy, matplotlib
# grc - the gnu radio companion # grc - the gnu radio companion
, cheetahTemplate, pygtk , cheetah, pygtk
# 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
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cheetahTemplate numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/aliases.nix
View File

@ -29,7 +29,6 @@ doNotDisplayTwice rec {
btrfsProgs = btrfs-progs; # added 2016-01-03 btrfsProgs = btrfs-progs; # added 2016-01-03
bundler_HEAD = bundler; # added 2015-11-15 bundler_HEAD = bundler; # added 2015-11-15
checkbashism = checkbashisms; # added 2016-08-16 checkbashism = checkbashisms; # added 2016-08-16
cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
cifs_utils = cifs-utils; # added 2016-08 cifs_utils = cifs-utils; # added 2016-08
clangAnalyzer = clang-analyzer; # added 2015-02-20 clangAnalyzer = clang-analyzer; # added 2015-02-20
clawsMail = claws-mail; # added 2016-04-29 clawsMail = claws-mail; # added 2016-04-29

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

@ -12721,11 +12721,12 @@ in
gksu = callPackage ../applications/misc/gksu { }; gksu = callPackage ../applications/misc/gksu { };
gnuradio = callPackage ../applications/misc/gnuradio { gnuradio = callPackage ../applications/misc/gnuradio {
inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; inherit (python2Packages) cheetah lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk;
fftw = fftwFloat; fftw = fftwFloat;
}; };
gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix {
inherit (python2Packages) python;
extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ];
}; };

1
pkgs/top-level/python-packages.nix
View File

@ -25966,6 +25966,7 @@ in {
wxPython = self.wxPython30; wxPython = self.wxPython30;
wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
pythonPackages = self;
wxGTK = pkgs.wxGTK30; wxGTK = pkgs.wxGTK30;
}; };