Merge branch 'staging-next' into staging

2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3908 additions and 1908 deletions
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -15,7 +15,7 @@
 , vala
 , gettext
 , perl
-, gnome3
+, gnome
 , gdk-pixbuf
 , zlib
 }:
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
  ];

  passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
      packageName = pname;
      versionPolicy = "none";
    };