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

python.pkgs: use toPythonModule for packages defined outside python-packages.nix

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-10-20 20:46:26 +02:00
parent 40851a4d26
commit 8d9f1701e6
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1372,10 +1372,10 @@ in {
# Build boost for this specific Python version # Build boost for this specific Python version
# TODO: use separate output for libboost_python.so # TODO: use separate output for libboost_python.so
boost = pkgs.boost.override { boost = toPythonModule (pkgs.boost.override {
inherit (self) python numpy; inherit (self) python numpy;
enablePython = true; enablePython = true;
}; });
buttersink = buildPythonPackage rec { buttersink = buildPythonPackage rec {
name = "buttersink-0.6.8"; name = "buttersink-0.6.8";
@ -3236,15 +3236,15 @@ in {
propagatedBuildInputs = with self; [ pyusb ]; propagatedBuildInputs = with self; [ pyusb ];
}; };
opencv = pkgs.opencv.override { opencv = toPythonModule (pkgs.opencv.override {
enablePython = true; enablePython = true;
pythonPackages = self; pythonPackages = self;
}; });
opencv3 = pkgs.opencv3.override { opencv3 = toPythonModule (pkgs.opencv3.override {
enablePython = true; enablePython = true;
pythonPackages = self; pythonPackages = self;
}; });
openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {};
@ -4772,12 +4772,10 @@ in {
easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { };
eccodes = if (isPy27) then eccodes = if (isPy27) then
(pkgs.eccodes.overrideAttrs (oldattrs: { toPythonModule (pkgs.eccodes.override {
name = "${python.libPrefix}-" + oldattrs.name; enablePython = true;
})).override { pythonPackages = self;
enablePython = true; }) else throw "eccodes not supported for interpreter ${python.executable}";
pythonPackages = self;
} else throw "eccodes not supported for interpreter ${python.executable}";
EditorConfig = buildPythonPackage rec { EditorConfig = buildPythonPackage rec {
name = "EditorConfig-${version}"; name = "EditorConfig-${version}";
@ -8747,10 +8745,10 @@ in {
folium = callPackage ../development/python-modules/folium { }; folium = callPackage ../development/python-modules/folium { };
fontforge = pkgs.fontforge.override { fontforge = toPythonModule (pkgs.fontforge.override {
withPython = true; withPython = true;
inherit python; inherit python;
}; });
fonttools = callPackage ../development/python-modules/fonttools { }; fonttools = callPackage ../development/python-modules/fonttools { };
@ -8924,11 +8922,9 @@ in {
}; };
}; };
gdal = (pkgs.gdal.overrideDerivation (oldattrs: { gdal = toPythonModule (pkgs.gdal.override {
name = "${python.libPrefix}-" + oldattrs.name;
})).override {
pythonPackages = self; pythonPackages = self;
}; });
gdrivefs = buildPythonPackage rec { gdrivefs = buildPythonPackage rec {
version = "0.14.8"; version = "0.14.8";
@ -9300,13 +9296,11 @@ in {
}; };
}; };
grib-api = if (isPy27) then grib-api = if (isPy27) then toPythonModule
(pkgs.grib-api.overrideAttrs (oldattrs: { (pkgs.grib-api.override {
name = "${python.libPrefix}-" + oldattrs.name; enablePython = true;
})).override { pythonPackages = self;
enablePython = true; }) else throw "grib-api not supported for interpreter ${python.executable}";
pythonPackages = self;
} else throw "grib-api not supported for interpreter ${python.executable}";
gspread = buildPythonPackage rec { gspread = buildPythonPackage rec {
version = "0.2.3"; version = "0.2.3";
@ -10409,13 +10403,13 @@ in {
}; };
libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else
(pkgs.libplist.override{python2Packages=self; }).py; (toPythonModule (pkgs.libplist.override{python2Packages=self; })).py;
libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else libxml2 = if isPy3k then throw "libxml2 not supported for interpreter ${python.executable}" else
(pkgs.libxml2.override{pythonSupport=true; python2=python;}).py; (toPythonModule (pkgs.libxml2.override{pythonSupport=true; python2=python;})).py;
libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else libxslt = if isPy3k then throw "libxslt not supported for interpreter ${python.executable}" else
(pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;}).py; (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py;
limnoria = buildPythonPackage rec { limnoria = buildPythonPackage rec {
name = "limnoria-${version}"; name = "limnoria-${version}";
@ -17477,7 +17471,7 @@ in {
rply = callPackage ../development/python-modules/rply/default.nix {}; rply = callPackage ../development/python-modules/rply/default.nix {};
rpm = (pkgs.rpm.override{inherit python;}); rpm = toPythonModule (pkgs.rpm.override{inherit python;});
rpmfluff = callPackage ../development/python-modules/rpmfluff {}; rpmfluff = callPackage ../development/python-modules/rpmfluff {};
@ -22124,7 +22118,7 @@ EOF
}; };
# For backwards compatibility. Please use nixpkgs.udiskie instead. # For backwards compatibility. Please use nixpkgs.udiskie instead.
udiskie = pkgs.udiskie.override { pythonPackages = self; }; udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; });
# Should be bumped along with EFL! # Should be bumped along with EFL!
pythonefl = buildPythonPackage rec { pythonefl = buildPythonPackage rec {
@ -24461,7 +24455,7 @@ EOF
zeep = callPackage ../development/python-modules/zeep { }; zeep = callPackage ../development/python-modules/zeep { };
zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
(pkgs.zeitgeist.override{python2Packages=self;}).py; (toPythonModule (pkgs.zeitgeist.override{python2Packages=self;})).py;
zeroconf = callPackage ../development/python-modules/zeroconf { }; zeroconf = callPackage ../development/python-modules/zeroconf { };