diff options
| author | Domen Kožar <domen@dev.si> | 2013-08-23 12:45:46 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2013-08-23 12:45:46 +0200 |
| commit | 50c0290f5178750784e15d5155c122f23b0babc1 (patch) | |
| tree | 2a971209b0ab3bee81e029a44ad4f5db3e9c2afa /pkgs/development/interpreters/pypy | |
| parent | a327b681649e3d6cdfaa201cf0bbd0d8537fb145 (diff) | |
| download | nixlib-50c0290f5178750784e15d5155c122f23b0babc1.tar nixlib-50c0290f5178750784e15d5155c122f23b0babc1.tar.gz nixlib-50c0290f5178750784e15d5155c122f23b0babc1.tar.bz2 nixlib-50c0290f5178750784e15d5155c122f23b0babc1.tar.lz nixlib-50c0290f5178750784e15d5155c122f23b0babc1.tar.xz nixlib-50c0290f5178750784e15d5155c122f23b0babc1.tar.zst nixlib-50c0290f5178750784e15d5155c122f23b0babc1.zip | |
pypy: 2.0 -> 2.1
Diffstat (limited to 'pkgs/development/interpreters/pypy')
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.0/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.0/setup-hook.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/pypy/2.0/default.nix b/pkgs/development/interpreters/pypy/2.0/default.nix index fb64d8040569..d02d5a8cb67f 100644 --- a/pkgs/development/interpreters/pypy/2.0/default.nix +++ b/pkgs/development/interpreters/pypy/2.0/default.nix @@ -5,8 +5,8 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.0"; - version = "${majorVersion}.2"; + majorVersion = "2.1"; + version = "${majorVersion}"; pythonVersion = "2.7"; libPrefix = "pypy${majorVersion}"; @@ -17,7 +17,7 @@ let src = fetchurl { 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 ] diff --git a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh index 96a04cb05dd9..87874f0370be 100644 --- a/pkgs/development/interpreters/pypy/2.0/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.0/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.0/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.0/site-packages" + p="$i/lib/pypy2.1/site-packages" result="${result}${result:+:}$p" done echo $result |