From 36bf2f60d1ebd96acd378056a4de92712e979842 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 15 Sep 2015 09:17:42 +0200 Subject: [PATCH 1/2] python-packages: Python 3.5 --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af8a3736c538..8bf124e208e0 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 From f97b4c4fb898a25eb55ed636bd5ff15b2fe6b012 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 15 Sep 2015 09:17:56 +0200 Subject: [PATCH 2/2] python-packages numpy: disabled for Py35 numpy 1.9.2 does not support python 3.5. The newer version, 1.9.3 or 1.10 for sure will. http://numpy-discussion.10968.n7.nabble.com/OK-to-upload-patched-1-9-2-for-Python-3-5-td41032.html --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bf124e208e0..411057541df3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9258,7 +9258,7 @@ let sha256 = "0apgmsk9jlaphb2dp1zaxqzdxkf69h1y3iw2d1pcnkj31cmmypij"; }; - disabled = isPyPy; # WIP + disabled = isPyPy || isPy35; # WIP preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py