dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pypy: 2.0 -> 2.1

Browse Source
This commit is contained in:
Domen Kožar 2013-08-23 12:45:46 +02:00
parent a327b68164
commit 50c0290f51
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null;
let let
majorVersion = "2.0"; majorVersion = "2.1";
version = "${majorVersion}.2"; 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 = "0g2cajs6m3yf0lak5f18ccs6j77cf5xvbm4h6y5l1qlqdc6wk48r"; sha256 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri";
}; };
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ]

4
pkgs/development/interpreters/pypy/2.0/setup-hook.sh
View File

@ -1,12 +1,12 @@
addPythonPath() { addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.0/site-packages addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/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.0/site-packages" p="$i/lib/pypy2.1/site-packages"
result="${result}${result:+:}$p" result="${result}${result:+:}$p"
done done
echo $result echo $result