Merge branch 'master' into staging

2017-03-30 12:54:41 -04:00
parent 9b049849bf f9a1060199
commit 8b65437aae
638 changed files with 9456 additions and 8715 deletions
@@ -108,7 +108,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; [ urkud jgeerds ];
+    maintainers = with maintainers; [ jgeerds ];
    platforms = platforms.linux;
  };
 }