alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

pypy: 2.1 -> 2.2

Browse source
This commit is contained in:
Domen Kožar 2013-11-14 11:09:28 +01:00
parent e597d102d8
commit 38185f8e51
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/interpreters/pypy/2.1/default.nix → pkgs/development/interpreters/pypy/2.2/default.nix
View file

@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null;
let let
majorVersion = "2.1"; majorVersion = "2.2";
version = "${majorVersion}"; version = "${majorVersion}";
pythonVersion = "2.7"; pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}"; libPrefix = "pypy${majorVersion}";
@ -17,7 +17,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2"; url = "https://bitbucket.org/pypy/pypy/downloads/pypy-${version}-src.tar.bz2";
sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri"; sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh";
}; };
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]

4
pkgs/development/interpreters/pypy/2.1/setup-hook.sh → pkgs/development/interpreters/pypy/2.2/setup-hook.sh
View file

@ -1,12 +1,12 @@
addPythonPath() { addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages
} }
toPythonPath() { toPythonPath() {
local paths="$1" local paths="$1"
local result= local result=
for i in $paths; do for i in $paths; do
p="$i/lib/pypy2.1/site-packages" p="$i/lib/pypy2.2/site-packages"
result="${result}${result:+:}$p" result="${result}${result:+:}$p"
done done
echo $result echo $result

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

@ -3235,7 +3235,7 @@ let
libX11 = xlibs.libX11; libX11 = xlibs.libX11;
}; };
pypy = callPackage ../development/interpreters/pypy/2.1 { }; pypy = callPackage ../development/interpreters/pypy/2.2 { };
pythonFull = python27Full; pythonFull = python27Full;
python26Full = callPackage ../development/interpreters/python/wrapper.nix { python26Full = callPackage ../development/interpreters/python/wrapper.nix {