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

pkgs/development/python-modules: stdenv.lib -> lib

Browse Source
This commit is contained in:
Pavol Rusnak
2021-01-24 01:29:22 +01:00
parent 2f34b4b883
commit a4bbfba80d
211 changed files with 525 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/python-modules/matplotlib/2.nix
View File

@@ -42,17 +42,17 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ which sphinx ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
++ lib.optional enableGhostscript ghostscript
++ lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver
libpng mock pytz ]
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ]
++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ];
++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ lib.optionals enableQt [ pyqt4 ]
++ lib.optionals python.isPy2 [ functools32 subprocess32 ];
setup_cfg = ./setup.cfg;
preBuild = ''
@@ -67,10 +67,9 @@ buildPythonPackage rec {
# script.
postPatch =
let
inherit (stdenv.lib.strings) substring;
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
in
stdenv.lib.optionalString enableTk
lib.optionalString enableTk
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
# Matplotlib needs to be built against a specific version of freetype in

15
pkgs/development/python-modules/matplotlib/default.nix
View File

@@ -35,15 +35,15 @@ buildPythonPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ which sphinx ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
++ lib.optional enableGhostscript ghostscript
++ lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil numpy pyparsing tornado freetype kiwisolver
certifi libpng mock pytz pillow ]
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt5 ];
++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ lib.optionals enableQt [ pyqt5 ];
setup_cfg = if stdenv.isDarwin then ./setup-darwin.cfg else ./setup.cfg;
preBuild = ''
@@ -58,10 +58,9 @@ buildPythonPackage rec {
# script.
postPatch =
let
inherit (stdenv.lib.strings) substring;
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${substring 0 3 tk.version}"'';
tcl_tk_cache = ''"${tk}/lib", "${tcl}/lib", "${lib.strings.substring 0 3 tk.version}"'';
in
stdenv.lib.optionalString enableTk
lib.optionalString enableTk
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
# Matplotlib needs to be built against a specific version of freetype in