public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pythonX.Y sitePackages passthru

Browse Source 
Let python tell you the correct path for site-packages.
This commit is contained in:
Florian Friesdorf 2014-07-07 18:39:57 +02:00
parent 19dd74c59a
commit 7dde165353
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -71,10 +71,11 @@ let
ln -s $out/share/man/man1/{python2.6.1,python.1} ln -s $out/share/man/man1/{python2.6.1,python.1}
''; '';
passthru = { passthru = rec {
inherit zlibSupport; inherit zlibSupport;
libPrefix = "python${majorVersion}"; libPrefix = "python${majorVersion}";
executable = "python2.6"; executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

5
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -85,10 +85,11 @@ let
paxmark E $out/bin/python${majorVersion} paxmark E $out/bin/python${majorVersion}
''; '';
passthru = { passthru = rec {
inherit zlibSupport; inherit zlibSupport;
libPrefix = "python${majorVersion}"; libPrefix = "python${majorVersion}";
executable = "python2.7"; executable = libPrefix;
sitePackages = "lib/${libPrefix}/site-packages";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -60,7 +60,7 @@ stdenv.mkDerivation {
ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
''; '';
passthru = { passthru = rec {
zlibSupport = zlib != null; zlibSupport = zlib != null;
sqliteSupport = sqlite != null; sqliteSupport = sqlite != null;
dbSupport = db != null; dbSupport = db != null;
@ -70,6 +70,7 @@ stdenv.mkDerivation {
libPrefix = "python${majorVersion}"; libPrefix = "python${majorVersion}";
executable = "python3.2m"; executable = "python3.2m";
is_py3k = true; is_py3k = true;
sitePackages = "lib/${libPrefix}/site-packages";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -57,7 +57,7 @@ stdenv.mkDerivation {
paxmark E $out/bin/python${majorVersion} paxmark E $out/bin/python${majorVersion}
''; '';
passthru = { passthru = rec {
zlibSupport = zlib != null; zlibSupport = zlib != null;
sqliteSupport = sqlite != null; sqliteSupport = sqlite != null;
dbSupport = db != null; dbSupport = db != null;
@ -67,6 +67,7 @@ stdenv.mkDerivation {
libPrefix = "python${majorVersion}"; libPrefix = "python${majorVersion}";
executable = "python3.3m"; executable = "python3.3m";
is_py3k = true; is_py3k = true;
sitePackages = "lib/${libPrefix}/site-packages";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -58,7 +58,7 @@ stdenv.mkDerivation {
paxmark E $out/bin/python${majorVersion} paxmark E $out/bin/python${majorVersion}
''; '';
passthru = { passthru = rec {
zlibSupport = zlib != null; zlibSupport = zlib != null;
sqliteSupport = sqlite != null; sqliteSupport = sqlite != null;
dbSupport = db != null; dbSupport = db != null;
@ -68,6 +68,7 @@ stdenv.mkDerivation {
libPrefix = "python${majorVersion}"; libPrefix = "python${majorVersion}";
executable = "python3.4m"; executable = "python3.4m";
is_py3k = true; is_py3k = true;
sitePackages = "lib/${libPrefix}/site-packages";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;