Merge branch 'master' into staging-next

There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
2019-07-06 13:44:40 +02:00
parent 8e97d0be6b d567c486ca
commit 0746c4dbb4
337 changed files with 11109 additions and 8836 deletions
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
    '';
    license = licenses.zlib;
    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = [ maintainers.garbas ];
+    maintainers = [ ];
  };
 }