Merge master into staging-next

2021-05-17 06:22:23 +00:00
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
--- a/pkgs/desktops/cdesktopenv/default.nix
+++ b/pkgs/desktops/cdesktopenv/default.nix
@@ -75,7 +75,7 @@ EOF
    description = "Common Desktop Environment";
    homepage = "https://sourceforge.net/projects/cdesktopenv/";
    license = licenses.lgpl2;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = [ "i686-linux" "x86_64-linux" ];
  };
 }