diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-08-01 15:08:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-01 15:08:20 +0200 |
commit | c74ad2ee2363f0e59a531cc37a0642d28d735d19 (patch) | |
tree | 1313a91f8d6d0ef1c44060898288f5330c291916 /pkgs/development/interpreters | |
parent | 52b787b0cd779f1f0da379127fa4e8db0b927551 (diff) | |
parent | 1da6775775e3695ff206bdcd3fca945bf5331101 (diff) | |
download | nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.gz nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.bz2 nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.lz nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.xz nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.tar.zst nixlib-c74ad2ee2363f0e59a531cc37a0642d28d735d19.zip |
Merge pull request #17339 from FRidh/rename
Python: move interpreters
Diffstat (limited to 'pkgs/development/interpreters')
-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 (renamed from pkgs/development/interpreters/pypy/default.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh (renamed from pkgs/development/interpreters/pypy/setup-hook.sh) | 0 |
47 files changed, 14 insertions, 14 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/pypy/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index f07e53e592f5..ba6f5706bbdc 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -117,10 +117,10 @@ let inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; - buildEnv = callPackage ../python/wrapper.nix { python = self; }; + buildEnv = callPackage ../../wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; sitePackages = "site-packages"; - withPackages = import ../python/with-packages.nix { inherit buildEnv; pythonPackages = pypyPackages; }; + withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = pypyPackages; }; }; enableParallelBuilding = true; # almost no parallelization without STM diff --git a/pkgs/development/interpreters/pypy/setup-hook.sh b/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh index e9081d1eaa53..e9081d1eaa53 100644 --- a/pkgs/development/interpreters/pypy/setup-hook.sh +++ b/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh |