diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 12:31:42 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-04 12:31:42 +0100 |
| commit | 63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae (patch) | |
| tree | 3d0dc65a4b544174d24c7485d43bb26fa7e4e656 /pkgs/development | |
| parent | 29ee864e93fe0c031423ed323c25b6367d0e72c6 (diff) | |
| download | nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.tar nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.tar.gz nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.tar.bz2 nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.tar.lz nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.tar.xz nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.tar.zst nixlib-63bcd0788883dc45fb5bcd68c6f4e89c1c2087ae.zip | |
python: add isPy2 attribute to passthru
Some packages relied on it. For consistency, also introduce isPy3 (which is the same as isPy3k).
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/matplotlib/2.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index bb5c3b3a97f5..f1461d784be0 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -27,7 +27,9 @@ with pkgs; isPy35 = pythonVersion == "3.5"; isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; - isPy3k = lib.strings.substring 0 1 pythonVersion == "3"; + isPy2 = lib.strings.substring 0 1 pythonVersion == "2"; + isPy3 = lib.strings.substring 0 1 pythonVersion == "3"; + isPy3k = isPy3; isPyPy = interpreter == "pypy"; buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index dec34c64f0a5..129b864a241d 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ++ 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 (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ]; + ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; patches = [ ./basedirlist.patch ] ++ |