Merge commit 'dfd8f84aef129f1978e446b5d45ef05cd4421821'

1 files changed, 5 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/development/interpreters/python/default.nix b/nixpkgs/pkgs/development/interpreters/python/default.nix
index 15af58be6fc9..ef4cab350211 100644
--- a/nixpkgs/pkgs/development/interpreters/python/default.nix
+++ b/nixpkgs/pkgs/development/interpreters/python/default.nix
@@ -30,7 +30,7 @@ with pkgs;
         isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
         isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
         isPy3k = isPy3;
-        isPyPy = interpreter == "pypy";
+        isPyPy = lib.hasInfix "pypy" interpreter;
 
         buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
         withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;};
@@ -100,11 +100,11 @@ in {
   pypy27 = callPackage ./pypy {
     self = pypy27;
     sourceVersion = {
-      major = "6";
+      major = "7";
       minor = "0";
       patch = "0";
     };
-    sha256 = "1qjwpc8n68sxxlfg36s5vn1h2gdfvvd6lxvr4lzbvfwhzrgqahsw";
+    sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894";
     pythonVersion = "2.7";
     db = db.override { dbmSupport = true; };
     python = python27;
@@ -114,11 +114,11 @@ in {
   pypy35 = callPackage ./pypy {
     self = pypy35;
     sourceVersion = {
-      major = "6";
+      major = "7";
       minor = "0";
       patch = "0";
     };
-    sha256 = "0lwq8nn0r5yj01bwmkk5p7xvvrp4s550l8184mkmn74d3gphrlwg";
+    sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w";
     pythonVersion = "3.5";
     db = db.override { dbmSupport = true; };
     python = python27;