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

recurse into python33 and pypy packages

Browse Source
This commit is contained in:
Domen Kozar
2013-07-29 14:52:19 +02:00
parent 4993f07fee
commit 918e5efb99
6 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/interpreters/pypy/2.0/default.nix
View File

@@ -7,6 +7,8 @@ let
majorVersion = "2.0";
version = "${majorVersion}.2";
pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}";
pypy = stdenv.mkDerivation rec {
name = "pypy-${version}";
@@ -57,18 +59,21 @@ let
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/pypy-c
# TODO: make libPrefix work
mkdir -p $out/{bin,include,lib,pypy-c}
cp -R {include,lib_pypy,lib-python,pypy-c} $out/pypy-c
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}
# TODO: compile python files?
'';
passthru = {
inherit zlibSupport;
libPrefix = "pypy${majorVersion}";
inherit zlibSupport libPrefix;
executable = "pypy";
};

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

@@ -51,6 +51,7 @@ stdenv.mkDerivation {
postInstall = ''
rm -rf "$out/lib/python${majorVersion}/test"
ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
'';
passthru = {
@@ -62,6 +63,7 @@ stdenv.mkDerivation {
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
libPrefix = "python${majorVersion}";
executable = "python3.2m";
is_py3k = true;
};
enableParallelBuilding = true;

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

@@ -51,6 +51,7 @@ stdenv.mkDerivation {
postInstall = ''
rm -rf "$out/lib/python${majorVersion}/test"
ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}"
'';
passthru = {
@@ -62,6 +63,7 @@ stdenv.mkDerivation {
tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null);
libPrefix = "python${majorVersion}";
executable = "python3.3m";
is_py3k = true;
};
enableParallelBuilding = true;