diff options
| author | Domen Kožar <domen@dev.si> | 2015-02-04 13:21:13 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-02-04 13:21:20 +0100 |
| commit | d75a91ef1e4f2a9ea768e4a775907a8dff151c0b (patch) | |
| tree | 3f91c94499dda77521907005363443d56c62d573 /pkgs/development/interpreters | |
| parent | 955001a55bd0f96688265f02f636358c3a2b05ad (diff) | |
| download | nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.tar nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.tar.gz nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.tar.bz2 nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.tar.lz nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.tar.xz nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.tar.zst nixlib-d75a91ef1e4f2a9ea768e4a775907a8dff151c0b.zip | |
pypy: 2.4 -> 2.5
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch | 19 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/default.nix (renamed from pkgs/development/interpreters/pypy/2.4/default.nix) | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/setup-hook.sh (renamed from pkgs/development/interpreters/pypy/2.4/setup-hook.sh) | 4 |
3 files changed, 4 insertions, 25 deletions
diff --git a/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch b/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch deleted file mode 100644 index dc01c5795dd1..000000000000 --- a/pkgs/development/interpreters/pypy/2.4/fix-gcc-4-9-2.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/rpython/translator/c/gcc/trackgcroot.py -+++ b/rpython/translator/c/gcc/trackgcroot.py -@@ -590,7 +590,7 @@ - - # The various cmov* operations - for name in ''' -- e ne g ge l le a ae b be p np s ns o no -+ e ne g ge l le a ae b be nb p np s ns o no - '''.split(): - locals()['visit_cmov' + name] = binary_insn - locals()['visit_cmov' + name + 'l'] = binary_insn -@@ -837,6 +837,7 @@ - visit_jb = conditional_jump - visit_jbe = conditional_jump - visit_jp = conditional_jump -+ visit_jnb = conditional_jump - visit_jnp = conditional_jump - visit_js = conditional_jump - visit_jns = conditional_jump diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/default.nix index 9799e810c6f1..d616d842adb6 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.4"; + majorVersion = "2.5"; version = "${majorVersion}.0"; libPrefix = "pypy${majorVersion}"; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "1lhk86clnkj305dxa6xr9wjib6ckf6xxl6qj0bq20vqh80nfq3by"; + sha256 = "126zrsx6663n9w60018mii1z7cqb87iq9irnhp8z630mldallr4d"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] @@ -30,8 +30,6 @@ let LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); - patches = [ ./fix-gcc-4-9-2.patch ]; - preConfigure = '' substituteInPlace Makefile \ --replace "-Ojit" "-Ojit --batch" \ diff --git a/pkgs/development/interpreters/pypy/2.4/setup-hook.sh b/pkgs/development/interpreters/pypy/setup-hook.sh index b9f5a38dcc64..057e619ebc89 100644 --- a/pkgs/development/interpreters/pypy/2.4/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.4/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.5/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.4/site-packages" + p="$i/lib/pypy2.5/site-packages" result="${result}${result:+:}$p" done echo $result |