Merge branch 'master' into staging-next

There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
2019-07-06 13:40:38 +02:00
parent 8e97d0be6b d567c486ca
commit 0746c4dbb4
337 changed files with 11109 additions and 8836 deletions
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
    homepage = http://linuxbrit.co.uk/scrot/;
    description = "A command-line screen capture utility";
    platforms = platforms.linux;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ ];
    license = licenses.mit;
  };
 }