Merge master into staging-next

2019-12-05 09:14:08 +01:00
parent 30fae2883e 1451a52a38
commit 51ef7c3e49
237 changed files with 2458 additions and 1153 deletions
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
    homepage = https://www.lcdf.org/gifsicle/;
    license = stdenv.lib.licenses.gpl2;
    platforms = platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu zimbatm ];
+    maintainers = with stdenv.lib.maintainers; [ zimbatm ];
  };
 }