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

2019-08-02 02:58:52 +02:00
parent 3bef4d156d 841e20e583
commit 30969073f0
316 changed files with 47697 additions and 39381 deletions
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -151,5 +151,6 @@ in with passthru; stdenv.mkDerivation rec {
    license = licenses.mit;
    platforms = [ "i686-linux" "x86_64-linux" ];
    maintainers = with maintainers; [ andersk ];
+    broken = true; # TODO: Tests are failing!
  };
 }