diff --git a/pkgs/development/interpreters/pypy/2.1/default.nix b/pkgs/development/interpreters/pypy/2.2/default.nix similarity index 97% rename from pkgs/development/interpreters/pypy/2.1/default.nix rename to pkgs/development/interpreters/pypy/2.2/default.nix index f80a1dc7242..b418b50c089 100644 --- a/pkgs/development/interpreters/pypy/2.1/default.nix +++ b/pkgs/development/interpreters/pypy/2.2/default.nix @@ -5,7 +5,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.1"; + majorVersion = "2.2"; 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 = "05vz7ya6jh5pw5yl607cf1rvdhwxj5d4ip0vpgb1gc9rjxn0dcri"; + sha256 = "0kp0922d1739v3fqnxhrbwz1fg651dc5dmk3199ikq1rc2wgrzsh"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] diff --git a/pkgs/development/interpreters/pypy/2.1/setup-hook.sh b/pkgs/development/interpreters/pypy/2.2/setup-hook.sh similarity index 82% rename from pkgs/development/interpreters/pypy/2.1/setup-hook.sh rename to pkgs/development/interpreters/pypy/2.2/setup-hook.sh index 87874f0370b..35f4915569e 100644 --- a/pkgs/development/interpreters/pypy/2.1/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.2/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.1/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.1/site-packages" + p="$i/lib/pypy2.2/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d86b360b89..59694147f59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3235,7 +3235,7 @@ let libX11 = xlibs.libX11; }; - pypy = callPackage ../development/interpreters/pypy/2.1 { }; + pypy = callPackage ../development/interpreters/pypy/2.2 { }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix {