pythonPackages: python.majorVersion -> python.pythonVersion
...because we're interested in the version of the language, not of the interpreter. This is important for PyPy packages.
This commit is contained in:
parent
12285d162c
commit
58175843b1
1 changed files with 7 additions and 7 deletions
|
@ -12,14 +12,14 @@ let
|
||||||
let
|
let
|
||||||
pythonAtLeast = versionAtLeast python.pythonVersion;
|
pythonAtLeast = versionAtLeast python.pythonVersion;
|
||||||
pythonOlder = versionOlder python.pythonVersion;
|
pythonOlder = versionOlder python.pythonVersion;
|
||||||
isPy26 = python.majorVersion == "2.6";
|
isPy26 = python.pythonVersion == "2.6";
|
||||||
isPy27 = python.majorVersion == "2.7";
|
isPy27 = python.pythonVersion == "2.7";
|
||||||
isPy33 = python.majorVersion == "3.3";
|
isPy33 = python.pythonVersion == "3.3";
|
||||||
isPy34 = python.majorVersion == "3.4";
|
isPy34 = python.pythonVersion == "3.4";
|
||||||
isPy35 = python.majorVersion == "3.5";
|
isPy35 = python.pythonVersion == "3.5";
|
||||||
isPy36 = python.majorVersion == "3.6";
|
isPy36 = python.pythonVersion == "3.6";
|
||||||
isPyPy = python.executable == "pypy";
|
isPyPy = python.executable == "pypy";
|
||||||
isPy3k = strings.substring 0 1 python.majorVersion == "3";
|
isPy3k = strings.substring 0 1 python.pythonVersion == "3";
|
||||||
|
|
||||||
callPackage = pkgs.newScope self;
|
callPackage = pkgs.newScope self;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue