Merge staging-next into staging

2019-08-17 09:39:23 +02:00
parent ed3cb39bfa c68f58d95c
commit fe9a3e3e63
174 changed files with 4833 additions and 1993 deletions
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
    homepage = https://cups.org/;
    description = "A standards-based printing system for UNIX";
    license = licenses.gpl2; # actually LGPL for the library and GPL for the rest
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ matthewbauer ];
    platforms = platforms.unix;
  };
 }