diff options
| author | Domen Kožar <domen@dev.si> | 2015-09-15 09:24:32 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-09-15 09:24:32 +0200 |
| commit | 46ae0a0c98dcb125fd1e923d328d71ae23e99288 (patch) | |
| tree | 156305f11e8e34b531ab8c0e1ed8eac5cd3ff640 | |
| parent | 39af9df25baf7fab741e96e6f059247bde199ef6 (diff) | |
| parent | f97b4c4fb898a25eb55ed636bd5ff15b2fe6b012 (diff) | |
| download | nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.tar nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.tar.gz nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.tar.bz2 nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.tar.lz nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.tar.xz nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.tar.zst nixpkgs-46ae0a0c98dcb125fd1e923d328d71ae23e99288.zip | |
Merge pull request #9870 from FRidh/python35
python-packages: Python 3.5
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af8a3736c53..411057541df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9,6 +9,7 @@ let isPy27 = python.majorVersion == "2.7"; isPy33 = python.majorVersion == "3.3"; isPy34 = python.majorVersion == "3.4"; + isPy35 = python.majorVersion == "3.5"; isPyPy = python.executable == "pypy"; isPy3k = strings.substring 0 1 python.majorVersion == "3"; @@ -22,6 +23,7 @@ let if isPy27 then "python27" else if isPy33 then "python33" else if isPy34 then "python34" else + if isPy35 then "python35" else if isPyPy then "pypy" else ""; modules = python.modules or { @@ -34,7 +36,7 @@ let pythonPackages = modules // { - inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName buildPythonPackage; + inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage; # helpers @@ -9256,7 +9258,7 @@ let sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij"; }; - disabled = isPyPy; # WIP + disabled = isPyPy || isPy35; # WIP preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py |