public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pypy: Change libPrefix from pypy5.10 to pypy2.7

Browse Source 
To avoid conflicting with pypy3, as per
https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2018-01-20 03:58:35 -05:00
parent 80738ed9dc
commit f96349c456
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/interpreters/python/pypy/2.7/default.nix
View File

@ -10,19 +10,16 @@
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
let let
majorVersion = "6.0"; version = "6.0.0";
minorVersion = "0";
minorVersionSuffix = "";
pythonVersion = "2.7"; pythonVersion = "2.7";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "pypy${pythonVersion}";
libPrefix = "pypy${majorVersion}";
sitePackages = "site-packages"; sitePackages = "site-packages";
pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]);
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "pypy-${version}"; name = "pypy-${version}";
inherit majorVersion version pythonVersion; inherit version pythonVersion;
src = fetchurl { src = fetchurl {
url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";