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

Merge pull request from FRidh/python35 

python-packages: Python 3.5
This commit is contained in:
Domen Kožar 2015-09-15 09:24:32 +02:00
parent 39af9df25b f97b4c4fb8
commit 46ae0a0c98
1 changed files with 4 additions and 2 deletions
pkgs/top-level
python-packages.nix

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

@ -9,6 +9,7 @@ let
isPy27 = python.majorVersion == "2.7"; isPy27 = python.majorVersion == "2.7";
isPy33 = python.majorVersion == "3.3"; isPy33 = python.majorVersion == "3.3";
isPy34 = python.majorVersion == "3.4"; isPy34 = python.majorVersion == "3.4";
isPy35 = python.majorVersion == "3.5";
isPyPy = python.executable == "pypy"; isPyPy = python.executable == "pypy";
isPy3k = strings.substring 0 1 python.majorVersion == "3"; isPy3k = strings.substring 0 1 python.majorVersion == "3";
@ -22,6 +23,7 @@ let
if isPy27 then "python27" else if isPy27 then "python27" else
if isPy33 then "python33" else if isPy33 then "python33" else
if isPy34 then "python34" else if isPy34 then "python34" else
if isPy35 then "python35" else
if isPyPy then "pypy" else ""; if isPyPy then "pypy" else "";
modules = python.modules or { modules = python.modules or {
@ -34,7 +36,7 @@ let
pythonPackages = modules // { pythonPackages = modules // {
inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage; inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage;
# helpers # helpers
@ -9256,7 +9258,7 @@ let
sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij"; sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij";
}; };
disabled = isPyPy; # WIP disabled = isPyPy || isPy35; # WIP
preConfigure = '' preConfigure = ''
sed -i 's/-faltivec//' numpy/distutils/system_info.py sed -i 's/-faltivec//' numpy/distutils/system_info.py