From f96349c45658174d33836ea6c2b5528473977284 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 03:58:35 -0500 Subject: [PATCH] pypy: Change libPrefix from pypy5.10 to pypy2.7 To avoid conflicting with pypy3, as per https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484. Signed-off-by: Anders Kaseorg --- .../development/interpreters/python/pypy/2.7/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d95707ecb22..3e2aa9d8d83 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -10,19 +10,16 @@ assert zlibSupport -> zlib != null; let - majorVersion = "6.0"; - minorVersion = "0"; - minorVersionSuffix = ""; + version = "6.0.0"; pythonVersion = "2.7"; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "pypy${majorVersion}"; + libPrefix = "pypy${pythonVersion}"; sitePackages = "site-packages"; pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); in stdenv.mkDerivation rec { name = "pypy-${version}"; - inherit majorVersion version pythonVersion; + inherit version pythonVersion; src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";