diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 17:40:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-10-23 17:40:41 +0200 |
commit | 2cf17b080206ef008d7b0d8f443f3cebd2c052ea (patch) | |
tree | f49a9b7299028462ba3c8be0da456284917dda8a /pkgs/development/interpreters/python | |
parent | 3ecd4dcf722ae4837be7cb60cef30a59a13b0a12 (diff) | |
parent | 8d67b707c7ce7bb2a3720e8ff9d46a8e3b601c6f (diff) |
Merge recent master into staging
Hydra nixpkgs: ?compare=1156478
Diffstat (limited to 'pkgs/development/interpreters/python')
6 files changed, 20 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index cbdb55f4cc353..97c96133aa5c0 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm}: +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; @@ -82,6 +82,7 @@ let inherit zlibSupport; isPy2 = true; isPy26 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 72c61e1f23587..e7c5326ddd49e 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: assert zlibSupport -> zlib != null; @@ -88,6 +88,7 @@ let inherit zlibSupport; isPy2 = true; isPy27 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 489d0509c1a48..dcc90ea5519c4 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -9,6 +9,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -64,6 +66,7 @@ stdenv.mkDerivation { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; + buildEnv = callPackage ../wrapper.nix { python = self; }; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index fcc0338034984..450abfa772bc1 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -10,6 +10,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -66,6 +68,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; + buildEnv = callPackage ../wrapper.nix { python = self; }; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 4ce659389ec66..b76b00047ba6b 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -10,6 +10,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -67,6 +69,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.4m"; + buildEnv = callPackage ../wrapper.nix { python = self; }; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 37180b1472b1d..163e8d7194ba0 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,10 +1,14 @@ -{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" +{ stdenv, python, buildEnv, makeWrapper +, extraLibs ? [] +, postBuild ? "" , ignoreCollisions ? false }: # Create a python executable that knows about additional packages. - +let + recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; +in (buildEnv { - name = "python-${python.version}-env"; + name = "${python.name}-env"; paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; inherit ignoreCollisions; |