Merge remote-tracking branch 'origin/master' into staging-next

2021-05-08 14:43:43 +02:00
parent 0388b1a029 b28f0d640f
commit 9651084620
657 changed files with 2572 additions and 1628 deletions
@@ -11,7 +11,7 @@
 , webkitgtk
 , makeWrapper
 , wrapGAppsHook
-, gnome3
+, gnome
 , gdk-pixbuf
 }:

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
    webkitgtk
    glib-networking
    gdk-pixbuf
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
  ];

  nativeBuildInputs = [
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
    description = "Web micro-framework written in Vala";
    license = licenses.lgpl3;
    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    maintainers = [ ];
  };
 }