diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-11-29 16:50:26 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-11-29 16:50:26 +0100 |
| commit | 920b1d3591431837f4522ccff52fb65b241200cf (patch) | |
| tree | a63a1acebbee20444f4b3e9e2695ec712ba7aae3 /pkgs/development/interpreters/pypy | |
| parent | 07a0204282224891492e7e1cfe72830a1fc32355 (diff) | |
| parent | a9056371a0a62da46ff88183a6535635ed085dec (diff) | |
| download | nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.gz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.bz2 nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.lz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.xz nixlib-920b1d3591431837f4522ccff52fb65b241200cf.tar.zst nixlib-920b1d3591431837f4522ccff52fb65b241200cf.zip | |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/development/interpreters/pypy')
| -rw-r--r-- | pkgs/development/interpreters/pypy/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/pypy/setup-hook.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index c6e2c5270d53..25c4b8ec9acd 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "2.6"; + majorVersion = "4.0"; 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 = "0xympj874cnjpxj68xm5gllq2f8bbvz8hr0md8mh1yd6fgzzxibh"; + sha256 = "008a7mxyw95asiz678v09p345v7pfchq6aa3x96fn7lkzhir67z7"; }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper ] @@ -119,7 +119,7 @@ let isPypy = true; buildEnv = callPackage ../python/wrapper.nix { python = self; }; interpreter = "${self}/bin/${executable}"; - sitePackages = "lib/${libPrefix}/site-packages"; + sitePackages = "site-packages"; }; enableParallelBuilding = true; # almost no parallelization without STM diff --git a/pkgs/development/interpreters/pypy/setup-hook.sh b/pkgs/development/interpreters/pypy/setup-hook.sh index c82179d9e87b..e9081d1eaa53 100644 --- a/pkgs/development/interpreters/pypy/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.6/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.6/site-packages" + p="$i/site-packages" result="${result}${result:+:}$p" done echo $result |