From ad666c56ff42bcf85baaecf6ebdcd116da27cc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 19 Jun 2014 17:53:22 +0200 Subject: [PATCH] pypy: correctly bump the version --- pkgs/development/interpreters/pypy/{2.2 => 2.3}/default.nix | 0 pkgs/development/interpreters/pypy/{2.2 => 2.3}/setup-hook.sh | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/interpreters/pypy/{2.2 => 2.3}/default.nix (100%) rename pkgs/development/interpreters/pypy/{2.2 => 2.3}/setup-hook.sh (82%) diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix similarity index 100% rename from pkgs/development/interpreters/pypy/2.2/default.nix rename to pkgs/development/interpreters/pypy/2.3/default.nix diff --git a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh similarity index 82% rename from pkgs/development/interpreters/pypy/2.2/setup-hook.sh rename to pkgs/development/interpreters/pypy/2.3/setup-hook.sh index 35f4915569e..67c71bf0081 100644 --- a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.2/site-packages" + p="$i/lib/pypy2.3/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 b17a38ad1f0..8ede0521df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3531,7 +3531,7 @@ let python = python27; python3 = python3Packages.python; - pypy = callPackage ../development/interpreters/pypy/2.2 { }; + pypy = callPackage ../development/interpreters/pypy/2.3 { }; pythonFull = python27Full; python26Full = callPackage ../development/interpreters/python/wrapper.nix {