Merge branch 'master' into staging

2017-07-28 16:08:30 +02:00
parent 9be40841ea 20d2bfa4ff
commit b116fa5ff2
117 changed files with 3980 additions and 1944 deletions
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
    description = "G'MIC is an open and full-featured framework for image processing";
    homepage = http://gmic.eu/;
    license = licenses.cecill20;
-    maintainers = [ maintainers.rycee ];
    platforms = platforms.unix;
  };
 }