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

pythonPackages: replace import with callPackage

Browse Source
This commit is contained in:
Domen Kožar 2014-09-13 20:43:04 +02:00
parent 7bcd577bd1
commit 18e4197f87
1 changed files with 44 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ pkgs, python }: { pkgs, python }:
with pkgs.lib;
with pkgs.lib;
let let
isPy26 = python.majorVersion == "2.6"; isPy26 = python.majorVersion == "2.6";
@ -17,23 +18,29 @@ let
if isPy34 then "python34" else if isPy34 then "python34" else
if isPyPy then "pypy" else ""; if isPyPy then "pypy" else "";
modules = python.modules or { readline = null; sqlite3 = null; curses = null; curses_panel = null; ssl = null; crypt = null; }; modules = python.modules or {
readline = null;
pythonPackages = modules // import ./python-packages-generated.nix { sqlite3 = null;
inherit pkgs python; curses = null;
inherit (pkgs) stdenv fetchurl; curses_panel = null;
self = pythonPackages; ssl = null;
} // crypt = null;
};
pythonPackages = modules // import ./python-packages-generated.nix {
inherit pkgs python;
inherit (pkgs) stdenv fetchurl;
self = pythonPackages;
}
# Python packages for all python versions # Python packages for all python versions
rec { // rec {
inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName; inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName;
inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip;
# helpers # helpers
callPackage = callPackageWith (pkgs // pythonPackages); callPackage = pkgs.newScope pythonPackages;
# global distutils config used by buildPythonPackage # global distutils config used by buildPythonPackage
distutils-cfg = callPackage ../development/python-modules/distutils-cfg { }; distutils-cfg = callPackage ../development/python-modules/distutils-cfg { };
@ -49,23 +56,16 @@ rec {
# specials # specials
recursivePthLoader = import ../development/python-modules/recursive-pth-loader { recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { };
inherit (pkgs) stdenv;
inherit python;
};
setuptools = import ../development/python-modules/setuptools { setuptools = callPackage ../development/python-modules/setuptools { };
inherit (pkgs) stdenv fetchurl;
inherit python wrapPython distutils-cfg;
};
# packages defined elsewhere # packages defined elsewhere
blivet = callPackage ../development/python-modules/blivet { }; blivet = callPackage ../development/python-modules/blivet { };
dbus = import ../development/python-modules/dbus { dbus = callPackage ../development/python-modules/dbus {
inherit (pkgs) stdenv fetchurl pkgconfig dbus dbus_glib dbus_tools; dbus = pkgs.dbus;
inherit python isPyPy;
}; };
discid = buildPythonPackage rec { discid = buildPythonPackage rec {
@ -91,8 +91,6 @@ rec {
}; };
h5py = callPackage ../development/python-modules/h5py { h5py = callPackage ../development/python-modules/h5py {
inherit (pkgs) stdenv fetchurl;
inherit python buildPythonPackage cython numpy;
hdf5 = pkgs.hdf5.override { mpi = null; }; hdf5 = pkgs.hdf5.override { mpi = null; };
}; };
@ -103,25 +101,19 @@ rec {
inherit mpi4py; inherit mpi4py;
}; };
ipython = import ../shells/ipython { ipython = callPackage ../shells/ipython {
inherit (pkgs) stdenv fetchurl sip pyqt4;
inherit buildPythonPackage pythonPackages;
qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin
pylabQtSupport = !pkgs.stdenv.isDarwin; pylabQtSupport = !pkgs.stdenv.isDarwin;
pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin
}; };
ipythonLight = lowPrio (import ../shells/ipython { ipythonLight = lowPrio (ipython.override {
inherit (pkgs) stdenv fetchurl;
inherit buildPythonPackage pythonPackages;
qtconsoleSupport = false; qtconsoleSupport = false;
pylabSupport = false; pylabSupport = false;
pylabQtSupport = false; pylabQtSupport = false;
}); });
mpi4py = callPackage ../development/python-modules/mpi4py { mpi4py = callPackage ../development/python-modules/mpi4py {
inherit (pkgs) stdenv fetchurl openssh;
inherit python buildPythonPackage;
mpi = pkgs.openmpi; mpi = pkgs.openmpi;
}; };
@ -131,74 +123,37 @@ rec {
# version of nixpart. # version of nixpart.
nixpart0 = nixpart; nixpart0 = nixpart;
pitz = import ../applications/misc/pitz { pitz = callPackage ../applications/misc/pitz { };
inherit (pkgs) stdenv fetchurl;
inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils; pycairo = callPackage ../development/python-modules/pycairo {
}; };
pycairo = import ../development/python-modules/pycairo { pycrypto = callPackage ../development/python-modules/pycrypto { };
inherit (pkgs) stdenv fetchurl fetchpatch pkgconfig cairo x11;
inherit python isPyPy; pygobject = callPackage ../development/python-modules/pygobject { };
pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
pygtk = callPackage ../development/python-modules/pygtk { libglade = null; };
pyGtkGlade = pygtk.override {
libglade = pkgs.gnome.libglade;
}; };
pycrypto = import ../development/python-modules/pycrypto { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
inherit (pkgs) fetchurl stdenv gmp;
inherit python buildPythonPackage;
};
pygobject = import ../development/python-modules/pygobject {
inherit (pkgs) stdenv fetchurl pkgconfig glib;
inherit python;
};
pygobject3 = import ../development/python-modules/pygobject/3.nix {
inherit (pkgs) stdenv fetchurl pkgconfig glib gobjectIntrospection cairo;
inherit python pycairo;
};
pygtk = import ../development/python-modules/pygtk {
inherit (pkgs) fetchurl stdenv pkgconfig gtk;
inherit python buildPythonPackage pygobject pycairo isPy3k;
};
# XXX: how can we get an override here?
#pyGtkGlade = pygtk.override {
# inherit (pkgs.gnome) libglade;
#};
pyGtkGlade = import ../development/python-modules/pygtk {
inherit (pkgs) fetchurl stdenv pkgconfig gtk;
inherit (pkgs.gnome) libglade;
inherit python buildPythonPackage pygobject pycairo isPy3k;
};
pyqt4 = import ../development/python-modules/pyqt/4.x.nix {
inherit (pkgs) stdenv fetchurl pkgconfig qt4 makeWrapper;
inherit (pkgs.xorg) lndir;
inherit python sip;
pythonDBus = dbus; pythonDBus = dbus;
}; };
pyqt5 = import ../development/python-modules/pyqt/5.x.nix { pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix {
inherit (pkgs) stdenv fetchurl pkgconfig qt5 makeWrapper;
inherit (pkgs.xorg) lndir;
inherit python;
sip = sip_4_16; sip = sip_4_16;
pythonDBus = dbus; pythonDBus = dbus;
}; };
sip = import ../development/python-modules/sip { sip = callPackage ../development/python-modules/sip { };
inherit (pkgs) stdenv fetchurl;
inherit python isPyPy;
};
sip_4_16 = import ../development/python-modules/sip/4.16.nix { sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { };
inherit (pkgs) stdenv fetchurl;
inherit python isPyPy;
};
tables = import ../development/python-modules/tables { tables = callPackage ../development/python-modules/tables {
inherit (pkgs) stdenv fetchurl bzip2 lzo;
inherit python buildPythonPackage cython numpy numexpr;
hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
}; };
@ -9217,15 +9172,11 @@ rec {
wxPython = wxPython28; wxPython = wxPython28;
wxPython28 = import ../development/python-modules/wxPython/2.8.nix { wxPython28 = callPackage ../development/python-modules/wxPython/2.8.nix {
inherit (pkgs) stdenv fetchurl pkgconfig;
inherit pythonPackages isPyPy python;
wxGTK = pkgs.wxGTK28; wxGTK = pkgs.wxGTK28;
}; };
wxPython30 = import ../development/python-modules/wxPython/3.0.nix { wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix {
inherit (pkgs) stdenv fetchurl pkgconfig;
inherit pythonPackages isPyPy python;
wxGTK = pkgs.wxGTK30; wxGTK = pkgs.wxGTK30;
}; };
@ -10810,4 +10761,4 @@ rec {
}); in pythonPackages }); in pythonPackages