Merge branch 'master' into staging-next

Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
parent 580cab57e4 bb3f7d14a1
commit 00df25ee57
298 changed files with 3752 additions and 5727 deletions
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
    description = "A command-line screen capture utility";
    platforms = platforms.linux;
    maintainers = with maintainers; [ garbas ];
+    license = licenses.mit;
  };
 }