ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

pypy: 2.3 -> 2.4

Browse Source
This commit is contained in:
Domen Kožar 2014-09-23 18:24:00 +02:00
parent 261a3574f1
commit 428fdc879f
3 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.3/default.nix → pkgs/development/interpreters/pypy/2.4/default.nix
View File

@ -6,8 +6,8 @@ assert zlibSupport -> zlib != null;
let let
majorVersion = "2.3"; majorVersion = "2.4";
version = "${majorVersion}.1"; version = "${majorVersion}.0";
pythonVersion = "2.7"; pythonVersion = "2.7";
libPrefix = "pypy${majorVersion}"; libPrefix = "pypy${majorVersion}";
@ -18,7 +18,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2";
sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; sha256 = "1lhk86clnkj305dxa6xr9wjib6ckf6xxl6qj0bq20vqh80nfq3by";
}; };
buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ]

2
pkgs/development/interpreters/pypy/2.3/setup-hook.sh → pkgs/development/interpreters/pypy/2.4/setup-hook.sh
View File

@ -1,5 +1,5 @@
addPythonPath() { addPythonPath() {
addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.4/site-packages
} }
toPythonPath() { toPythonPath() {

2
pkgs/top-level/all-packages.nix
View File

@ -3878,7 +3878,7 @@ let
python33 = callPackage ../development/interpreters/python/3.3 { }; python33 = callPackage ../development/interpreters/python/3.3 { };
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
pypy = callPackage ../development/interpreters/pypy/2.3 { }; pypy = callPackage ../development/interpreters/pypy/2.4 { };
python26Full = callPackage ../development/interpreters/python/wrapper.nix { python26Full = callPackage ../development/interpreters/python/wrapper.nix {
extraLibs = []; extraLibs = [];