diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-07-07 14:05:05 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-07-28 17:10:15 +0200 |
commit | 1da6775775e3695ff206bdcd3fca945bf5331101 (patch) | |
tree | 9da34dc021261438f4bd6603ea0980a9bbb75c9f /pkgs/development/interpreters/python | |
parent | 86393cfc205c4f8d474b928878b45b118f2c7b16 (diff) | |
download | nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.gz nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.bz2 nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.lz nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.xz nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.tar.zst nixlib-1da6775775e3695ff206bdcd3fca945bf5331101.zip |
Python: move interpreters
Move Python interpreters (CPython, PyPy) to same folder and share layout.
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.6/default.nix (renamed from pkgs/development/interpreters/python/2.6/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch (renamed from pkgs/development/interpreters/python/2.6/nix-store-mtime.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch (renamed from pkgs/development/interpreters/python/2.6/python2.6-fix-parallel-make.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.6/search-path.patch (renamed from pkgs/development/interpreters/python/2.6/search-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh (renamed from pkgs/development/interpreters/python/2.6/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch (renamed from pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch (renamed from pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch (renamed from pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch (renamed from pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch (renamed from pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch (renamed from pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch (renamed from pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch (renamed from pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch (renamed from pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch (renamed from pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix (renamed from pkgs/development/interpreters/python/2.7/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch (renamed from pkgs/development/interpreters/python/2.7/deterministic-build.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch (renamed from pkgs/development/interpreters/python/2.7/nix-store-mtime.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch (renamed from pkgs/development/interpreters/python/2.7/no-ldconfig.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch (renamed from pkgs/development/interpreters/python/2.7/properly-detect-curses.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/search-path.patch (renamed from pkgs/development/interpreters/python/2.7/search-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh (renamed from pkgs/development/interpreters/python/2.7/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.3/default.nix (renamed from pkgs/development/interpreters/python/3.3/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh (renamed from pkgs/development/interpreters/python/3.3/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.4/default.nix (renamed from pkgs/development/interpreters/python/3.4/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh (renamed from pkgs/development/interpreters/python/3.4/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.5/default.nix (renamed from pkgs/development/interpreters/python/3.5/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh (renamed from pkgs/development/interpreters/python/3.5/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.6/default.nix (renamed from pkgs/development/interpreters/python/3.6/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh (renamed from pkgs/development/interpreters/python/3.6/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.6-html.nix (renamed from pkgs/development/interpreters/python/docs/2.6-html.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix (renamed from pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix (renamed from pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.6-text.nix (renamed from pkgs/development/interpreters/python/docs/2.6-text.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.7-html.nix (renamed from pkgs/development/interpreters/python/docs/2.7-html.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix (renamed from pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix (renamed from pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/2.7-text.nix (renamed from pkgs/development/interpreters/python/docs/2.7-text.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/3.3-html.nix (renamed from pkgs/development/interpreters/python/docs/3.3-html.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix (renamed from pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix (renamed from pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/3.3-text.nix (renamed from pkgs/development/interpreters/python/docs/3.3-text.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/default.nix (renamed from pkgs/development/interpreters/python/docs/default.nix) | 0 | ||||
-rwxr-xr-x | pkgs/development/interpreters/python/cpython/docs/generate.sh (renamed from pkgs/development/interpreters/python/docs/generate.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/cpython/docs/template.nix (renamed from pkgs/development/interpreters/python/docs/template.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/pypy/2.7/default.nix | 137 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh | 15 |
47 files changed, 164 insertions, 12 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index 6641eb24b241..e5c33cd7b2bd 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -99,8 +99,8 @@ let inherit zlibSupport; isPy2 = true; isPy26 = true; - buildEnv = callPackage ../wrapper.nix { python = self; }; - withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/2.6/nix-store-mtime.patch b/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch index 83f3fea1931b..83f3fea1931b 100644 --- a/pkgs/development/interpreters/python/2.6/nix-store-mtime.patch +++ b/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch diff --git a/pkgs/development/interpreters/python/2.6/python2.6-fix-parallel-make.patch b/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch index c43e141f9afb..c43e141f9afb 100644 --- a/pkgs/development/interpreters/python/2.6/python2.6-fix-parallel-make.patch +++ b/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch diff --git a/pkgs/development/interpreters/python/2.6/search-path.patch b/pkgs/development/interpreters/python/cpython/2.6/search-path.patch index 2e7b7526c0ce..2e7b7526c0ce 100644 --- a/pkgs/development/interpreters/python/2.6/search-path.patch +++ b/pkgs/development/interpreters/python/cpython/2.6/search-path.patch diff --git a/pkgs/development/interpreters/python/2.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh index 4caff9c9d846..4caff9c9d846 100644 --- a/pkgs/development/interpreters/python/2.6/setup-hook.sh +++ b/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch b/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch index 22bc0f7ced0a..22bc0f7ced0a 100644 --- a/pkgs/development/interpreters/python/2.7/2.5.2-ctypes-util-find_library.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.5.2-ctypes-util-find_library.patch diff --git a/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch b/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch index 28b6dafc3f15..28b6dafc3f15 100644 --- a/pkgs/development/interpreters/python/2.7/2.5.2-tkinter-x11.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.5.2-tkinter-x11.patch diff --git a/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch b/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch index bef137efda7b..bef137efda7b 100644 --- a/pkgs/development/interpreters/python/2.7/2.6.2-ssl-threads.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.6.2-ssl-threads.patch diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch b/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch index d1dae8c47dc1..d1dae8c47dc1 100644 --- a/pkgs/development/interpreters/python/2.7/2.6.5-FD_SETSIZE.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.6.5-FD_SETSIZE.patch diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch b/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch index ea696978236a..ea696978236a 100644 --- a/pkgs/development/interpreters/python/2.7/2.6.5-export-PySignal_SetWakeupFd.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.6.5-export-PySignal_SetWakeupFd.patch diff --git a/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch b/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch index e1cf5ad4bbf9..e1cf5ad4bbf9 100644 --- a/pkgs/development/interpreters/python/2.7/2.6.5-ncurses-abi6.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.6.5-ncurses-abi6.patch diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch index bfaeb37c287d..bfaeb37c287d 100644 --- a/pkgs/development/interpreters/python/2.7/2.7.3-dbm.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dbm.patch diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch index 6e1fc8b53e83..6e1fc8b53e83 100644 --- a/pkgs/development/interpreters/python/2.7/2.7.3-dylib.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-dylib.patch diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch index 68f6921ba6aa..68f6921ba6aa 100644 --- a/pkgs/development/interpreters/python/2.7/2.7.3-getpath-exe-extension.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-getpath-exe-extension.patch diff --git a/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch index 55281db6768f..55281db6768f 100644 --- a/pkgs/development/interpreters/python/2.7/2.7.3-no-libm.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/2.7.3-no-libm.patch diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index aca88f504a0d..96c098c82dca 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -160,8 +160,8 @@ let inherit zlibSupport; isPy2 = true; isPy27 = true; - buildEnv = callPackage ../wrapper.nix { python = self; }; - withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/2.7/deterministic-build.patch b/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch index 98d9d339fa11..98d9d339fa11 100644 --- a/pkgs/development/interpreters/python/2.7/deterministic-build.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/deterministic-build.patch diff --git a/pkgs/development/interpreters/python/2.7/nix-store-mtime.patch b/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch index 83f3fea1931b..83f3fea1931b 100644 --- a/pkgs/development/interpreters/python/2.7/nix-store-mtime.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/nix-store-mtime.patch diff --git a/pkgs/development/interpreters/python/2.7/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch index 44c38fb29534..44c38fb29534 100644 --- a/pkgs/development/interpreters/python/2.7/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/no-ldconfig.patch diff --git a/pkgs/development/interpreters/python/2.7/properly-detect-curses.patch b/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch index e2640bab0e9a..e2640bab0e9a 100644 --- a/pkgs/development/interpreters/python/2.7/properly-detect-curses.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch diff --git a/pkgs/development/interpreters/python/2.7/search-path.patch b/pkgs/development/interpreters/python/cpython/2.7/search-path.patch index 2e7b7526c0ce..2e7b7526c0ce 100644 --- a/pkgs/development/interpreters/python/2.7/search-path.patch +++ b/pkgs/development/interpreters/python/cpython/2.7/search-path.patch diff --git a/pkgs/development/interpreters/python/2.7/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh index 4770eea886f6..4770eea886f6 100644 --- a/pkgs/development/interpreters/python/2.7/setup-hook.sh +++ b/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index 8a36e03c7840..1d2312fdc151 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -88,8 +88,8 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; - buildEnv = callPackage ../wrapper.nix { python = self; }; - withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.3/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh index 82a8c0abd32f..82a8c0abd32f 100644 --- a/pkgs/development/interpreters/python/3.3/setup-hook.sh +++ b/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 7ea6adc4370d..64c61e504b7e 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -111,8 +111,8 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.4m"; - buildEnv = callPackage ../wrapper.nix { python = self; }; - withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.4/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh index fddcc0b73fe8..fddcc0b73fe8 100644 --- a/pkgs/development/interpreters/python/3.4/setup-hook.sh +++ b/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 21716c87386f..c36d7c2a6eb9 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -111,8 +111,8 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python${majorVersion}m"; - buildEnv = callPackage ../wrapper.nix { python = self; }; - withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; isPy3 = true; isPy35 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.5/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh index 2836ad7e8f56..2836ad7e8f56 100644 --- a/pkgs/development/interpreters/python/3.5/setup-hook.sh +++ b/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh diff --git a/pkgs/development/interpreters/python/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 9515e1587d7f..a337b28859b7 100644 --- a/pkgs/development/interpreters/python/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -115,8 +115,8 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python${majorVersion}m"; - buildEnv = callPackage ../wrapper.nix { python = self; }; - withPackages = import ../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; }; isPy3 = true; isPy35 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh index 26a0d57bc87c..26a0d57bc87c 100644 --- a/pkgs/development/interpreters/python/3.6/setup-hook.sh +++ b/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh diff --git a/pkgs/development/interpreters/python/docs/2.6-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix index 2b41f122fa9b..2b41f122fa9b 100644 --- a/pkgs/development/interpreters/python/docs/2.6-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix diff --git a/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix index ec031821a03f..ec031821a03f 100644 --- a/pkgs/development/interpreters/python/docs/2.6-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix diff --git a/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix index 7cacf7778348..7cacf7778348 100644 --- a/pkgs/development/interpreters/python/docs/2.6-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix diff --git a/pkgs/development/interpreters/python/docs/2.6-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix index eb394a3f3e2d..eb394a3f3e2d 100644 --- a/pkgs/development/interpreters/python/docs/2.6-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix diff --git a/pkgs/development/interpreters/python/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index 3885b43960f5..3885b43960f5 100644 --- a/pkgs/development/interpreters/python/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix diff --git a/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index d8dde17ac66a..d8dde17ac66a 100644 --- a/pkgs/development/interpreters/python/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix diff --git a/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 32581cd229a9..32581cd229a9 100644 --- a/pkgs/development/interpreters/python/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix diff --git a/pkgs/development/interpreters/python/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index 590192383016..590192383016 100644 --- a/pkgs/development/interpreters/python/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix diff --git a/pkgs/development/interpreters/python/docs/3.3-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix index 055224dd740b..055224dd740b 100644 --- a/pkgs/development/interpreters/python/docs/3.3-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.3-html.nix diff --git a/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix index 8c6b842d0b94..8c6b842d0b94 100644 --- a/pkgs/development/interpreters/python/docs/3.3-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-a4.nix diff --git a/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix index 046abe8f83d7..046abe8f83d7 100644 --- a/pkgs/development/interpreters/python/docs/3.3-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.3-pdf-letter.nix diff --git a/pkgs/development/interpreters/python/docs/3.3-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix index 4d99c25bf598..4d99c25bf598 100644 --- a/pkgs/development/interpreters/python/docs/3.3-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.3-text.nix diff --git a/pkgs/development/interpreters/python/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index 8f5fc810fb71..8f5fc810fb71 100644 --- a/pkgs/development/interpreters/python/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix diff --git a/pkgs/development/interpreters/python/docs/generate.sh b/pkgs/development/interpreters/python/cpython/docs/generate.sh index bebefc10ccd0..bebefc10ccd0 100755 --- a/pkgs/development/interpreters/python/docs/generate.sh +++ b/pkgs/development/interpreters/python/cpython/docs/generate.sh diff --git a/pkgs/development/interpreters/python/docs/template.nix b/pkgs/development/interpreters/python/cpython/docs/template.nix index cc92f71bc1ea..cc92f71bc1ea 100644 --- a/pkgs/development/interpreters/python/docs/template.nix +++ b/pkgs/development/interpreters/python/cpython/docs/template.nix diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix new file mode 100644 index 000000000000..ba6f5706bbdc --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -0,0 +1,137 @@ +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, xlibsWrapper, libX11 +, makeWrapper, callPackage, self, pypyPackages, gdbm, db }: + +assert zlibSupport -> zlib != null; + +let + + majorVersion = "5.1.1"; + version = "${majorVersion}"; + libPrefix = "pypy${majorVersion}"; + + pypy = stdenv.mkDerivation rec { + name = "pypy-${version}"; + pythonVersion = "2.7"; + + inherit majorVersion version; + + src = fetchurl { + url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; + sha256 = "1dmckvffanmh0b50pq34shnw05r55gjxn43kgvnkz5kkvvsbxdg1"; + }; + + # http://bugs.python.org/issue27369 + postPatch = let + expatch = fetchurl { + name = "tests-expat-2.2.0.patch"; + url = "http://bugs.python.org/file43514/0001-Fix-Python-2.7.11-tests-for-Expat-2.2.0.patch"; + sha256 = "1j3pa7ly9xrhp8jjwg5l77z7i3y68gx8f8jchqk6zc39d9glq3il"; + }; + in '' + patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' + ''; + + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] + ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc + ++ stdenv.lib.optional zlibSupport zlib; + + C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); + + preConfigure = '' + # hint pypy to find nix ncurses + substituteInPlace pypy/module/_minimal_curses/fficurses.py \ + --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \ + --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \ + --replace "libraries=['curses']" "libraries=['ncurses']" + + # tkinter hints + substituteInPlace lib_pypy/_tkinter/tklib_build.py \ + --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \ + --replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \ + --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" + + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py + ''; + + buildPhase = '' + ${pythonFull.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing + ''; + + setupHook = ./setup-hook.sh; + + postBuild = '' + cd ./lib_pypy + ../pypy-c ./_audioop_build.py + ../pypy-c ./_curses_build.py + ../pypy-c ./_pwdgrp_build.py + ../pypy-c ./_sqlite3_build.py + ../pypy-c ./_syslog_build.py + ../pypy-c ./_tkinter/tklib_build.py + cd .. + ''; + + doCheck = true; + checkPhase = '' + export TERMINFO="${ncurses.out}/share/terminfo/"; + export TERM="xterm"; + export HOME="$TMPDIR"; + # disable shutils because it assumes gid 0 exists + # disable socket because it has two actual network tests that fail + # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) + # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure + # disable test_zipfile64 because it causes ENOSPACE + # disable test_epoll because of invalid arg, should be fixed in as of version 5.1.2 + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )' lib-python + ''; + + installPhase = '' + mkdir -p $out/{bin,include,lib,pypy-c} + + cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c + cp libpypy-c.so $out/lib/ + ln -s $out/pypy-c/pypy-c $out/bin/pypy + chmod +x $out/bin/pypy + + # other packages expect to find stuff according to libPrefix + ln -s $out/pypy-c/include $out/include/${libPrefix} + ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + + # We must wrap the original, not the symlink. + # PyPy uses argv[0] to find its standard library, and while it knows + # how to follow symlinks, it doesn't know about wrappers. So, it + # will think the wrapper is the original. As long as the wrapper has + # the same path as the original, this is OK. + wrapProgram "$out/pypy-c/pypy-c" \ + --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \ + --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib" + + # verify cffi modules + $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" + ''; + + passthru = rec { + inherit zlibSupport libPrefix; + executable = "pypy"; + isPypy = true; + buildEnv = callPackage ../../wrapper.nix { python = self; }; + interpreter = "${self}/bin/${executable}"; + sitePackages = "site-packages"; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = pypyPackages; }; + }; + + enableParallelBuilding = true; # almost no parallelization without STM + + meta = with stdenv.lib; { + homepage = http://pypy.org/; + description = "Fast, compliant alternative implementation of the Python language (2.7.8)"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ domenkozar ]; + }; + }; + +in pypy diff --git a/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh b/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh new file mode 100644 index 000000000000..e9081d1eaa53 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh @@ -0,0 +1,15 @@ +addPythonPath() { + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages +} + +toPythonPath() { + local paths="$1" + local result= + for i in $paths; do + p="$i/site-packages" + result="${result}${result:+:}$p" + done + echo $result +} + +envHooks+=(addPythonPath) |