alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

python: add isPy2 attribute to passthru

Browse source 
Some packages relied on it. For consistency, also introduce isPy3 (which
is the same as isPy3k).
This commit is contained in:
Frederik Rietdijk 2019-01-04 12:31:42 +01:00
parent 29ee864e93
commit 63bcd07888
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/interpreters/python/default.nix
View file

@ -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; };

2
pkgs/development/python-modules/matplotlib/2.nix
View file

@ -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 ] ++

2
pkgs/servers/uwsgi/default.nix
View file

@ -7,7 +7,7 @@
, ruby, php-embed, mysql
}:
let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" {
let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
interpreter = pkg.interpreter;
path = "plugins/python";
inputs = [ pkg ncurses ];