Merge staging-next into staging

2019-07-09 15:44:08 +02:00
parent 46d91410af 5c8472a2a1
commit 7cf5909fad
339 changed files with 11134 additions and 8903 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;
  };
 }