mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

python27FullBuildEnv -> python.buildEnv for all interpreters

Browse source
This commit is contained in:
Domen Kožar 2014-10-19 19:48:07 +02:00
parent 67a1a96b49
commit 2d6582d14e
8 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/interpreters/pypy/2.4/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11
, makeWrapper }:
, makeWrapper, callPackage, self }:
assert zlibSupport -> zlib != null;
@ -99,6 +99,7 @@ let
inherit zlibSupport libPrefix;
executable = "pypy";
isPypy = true;
buildEnv = callPackage ../../python/wrapper.nix { python = self; };
};
enableParallelBuilding = true;

3
pkgs/development/interpreters/python/2.6/default.nix
View file

@ -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";

3
pkgs/development/interpreters/python/2.7/default.nix
View file

@ -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;
@ -87,6 +87,7 @@ let
inherit zlibSupport;
isPy2 = true;
isPy27 = true;
buildEnv = callPackage ../wrapper.nix { python = self; };
libPrefix = "python${majorVersion}";
executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";

3
pkgs/development/interpreters/python/3.2/default.nix
View file

@ -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);

3
pkgs/development/interpreters/python/3.3/default.nix
View file

@ -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

3
pkgs/development/interpreters/python/3.4/default.nix
View file

@ -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

10
pkgs/development/interpreters/python/wrapper.nix
View file

@ -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;

38
pkgs/top-level/all-packages.nix
View file

@ -3950,32 +3950,36 @@ let
python2Packages = python27Packages;
python3Packages = python34Packages;
python26 = callPackage ../development/interpreters/python/2.6 { db = db47; };
python27 = callPackage ../development/interpreters/python/2.7 { };
python32 = callPackage ../development/interpreters/python/3.2 { };
python33 = callPackage ../development/interpreters/python/3.3 { };
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
pypy = callPackage ../development/interpreters/pypy/2.4 { };
python26 = callPackage ../development/interpreters/python/2.6 {
db = db47;
self = python26;
};
python27 = callPackage ../development/interpreters/python/2.7 {
self = python27;
};
python32 = callPackage ../development/interpreters/python/3.2 {
self = python32;
};
python33 = callPackage ../development/interpreters/python/3.3 {
self = python33;
};
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 {
self = python34;
});
pypy = callPackage ../development/interpreters/pypy/2.4 {
self = pypy;
};
pythonFull = python2Full;
python2Full = python27Full;
python26Full = python26.override {
includeModules = true;
self = python26Full;
};
python27Full = python27.override {
includeModules = true;
self = python27Full;
};
python26FullBuildEnv = callPackage ../development/interpreters/python/wrapper.nix {
python = python26Full;
inherit (python26Packages) recursivePthLoader;
};
python27FullBuildEnv = callPackage ../development/interpreters/python/wrapper.nix {
python = python27Full;
inherit (python27Packages) recursivePthLoader;
};
pythonFullBuildEnv = python2FullBuildEnv;
python2FullBuildEnv = python27FullBuildEnv;
python2nix = callPackage ../tools/package-management/python2nix { };