Merge remote-tracking branch 'upstream/master' into openssl-1.1

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" ];
   };
 
-}
+}