Merge master into staging-next

pkgs/development/interpreters/python/default.nix

@@ -115,25 +115,25 @@ in {
     self = pypy27;
     sourceVersion = {
       major = "7";
-      minor = "0";
-      patch = "0";
+      minor = "1";
+      patch = "1";
     };
-    sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894";
+    sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg";
     pythonVersion = "2.7";
     db = db.override { dbmSupport = true; };
     python = python27;
     inherit passthruFun;
   };
 
-  pypy35 = callPackage ./pypy {
-    self = pypy35;
+  pypy36 = callPackage ./pypy {
+    self = pypy36;
     sourceVersion = {
       major = "7";
-      minor = "0";
-      patch = "0";
+      minor = "1";
+      patch = "1";
     };
-    sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w";
-    pythonVersion = "3.5";
+    sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1";
+    pythonVersion = "3.6";
     db = db.override { dbmSupport = true; };
     python = python27;
     inherit passthruFun;
@@ -143,26 +143,26 @@ in {
     # Not included at top-level
     self = pythonInterpreters.pypy27_prebuilt;
     sourceVersion = {
-      major = "6";
-      minor = "0";
-      patch = "0";
+      major = "7";
+      minor = "1";
+      patch = "1";
     };
-    sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64
+    sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64
     pythonVersion = "2.7";
     inherit passthruFun;
     ncurses = ncurses5;
   };
 
-  pypy35_prebuilt = callPackage ./pypy/prebuilt.nix {
-  # Not included at top-level
-    self = pythonInterpreters.pypy35_prebuilt;
+  pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
+    # Not included at top-level
+    self = pythonInterpreters.pypy36_prebuilt;
     sourceVersion = {
-      major = "6";
-      minor = "0";
-      patch = "0";
+      major = "7";
+      minor = "1";
+      patch = "1";
     };
-    sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64
-    pythonVersion = "3.5";
+    sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64
+    pythonVersion = "3.6";
     inherit passthruFun;
     ncurses = ncurses5;
   };

pkgs/development/interpreters/python/pypy/default.nix

@@ -88,7 +88,9 @@ in with passthru; stdenv.mkDerivation rec {
 
   setupHook = python-setup-hook sitePackages;
 
-  doCheck = true;
+  # TODO: A bunch of tests are failing as of 7.1.1, please feel free to
+  # fix and re-enable if you have the patience and tenacity.
+  doCheck = false;
   checkPhase = let
     disabledTests = [
       # disable shutils because it assumes gid 0 exists
@@ -139,7 +141,7 @@ in with passthru; stdenv.mkDerivation rec {
     echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
 
     # Include a sitecustomize.py file
-    cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py
+    cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py
   '';
 
   inherit passthru;
@@ -149,8 +151,7 @@ in with passthru; stdenv.mkDerivation rec {
     homepage = http://pypy.org/;
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ andersk ];
-    broken = true; # TODO: Tests are failing!
   };
 }

pkgs/development/interpreters/python/pypy/prebuilt.nix

@@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
-    url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2";
+    url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
     inherit sha256;
   };
 
@@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation {
     platforms = [ "x86_64-linux" ];
   };
 
-}
+}