gnome: rename from gnome3

Since GNOME version is now 40, it no longer makes sense to use the old attribute name.

pkgs/desktops/cinnamon/cinnamon-common/default.nix

@@ -28,7 +28,7 @@
 , wrapGAppsHook
 , libxml2
 , gtk-doc
-, gnome3
+, gnome
 , python3
 , keybinder3
 , cairo
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
     # bindings
     cairo
-    gnome3.caribou
+    gnome.caribou
     keybinder3
     upower
     xapps

pkgs/desktops/cinnamon/cinnamon-control-center/default.nix

@@ -18,7 +18,7 @@
 , libxklavier
 , networkmanager
 , libwacom
-, gnome3
+, gnome
 , wrapGAppsHook
 , tzdata
 , glibc

pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix

@@ -12,7 +12,7 @@
 , libxslt
 , gtk3
 , libgnomekbd
-, gnome3
+, gnome
 , libtool
 , wrapGAppsHook
 , gobject-introspection
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     cinnamon-desktop
     cinnamon-common
     libgnomekbd
-    gnome3.caribou
+    gnome.caribou
 
     # things
     iso-flags-png-320x420

pkgs/desktops/cinnamon/cjs/default.nix

@@ -7,7 +7,7 @@
 , wrapGAppsHook
 , python3
 , cairo
-, gnome3
+, gnome
 , xapps
 , keybinder3
 , upower
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     glib
 
     # bindings
-    gnome3.caribou
+    gnome.caribou
     keybinder3
     upower
     xapps

pkgs/desktops/cinnamon/mint-x-icons/default.nix

@@ -1,6 +1,6 @@
 { fetchFromGitHub
 , lib, stdenv
-, gnome3
+, gnome
 , gnome-icon-theme
 , hicolor-icon-theme
 , gtk3
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gnome-icon-theme
     hicolor-icon-theme
     humanity-icon-theme

pkgs/desktops/cinnamon/mint-y-icons/default.nix

@@ -1,6 +1,6 @@
 { fetchFromGitHub
 , lib, stdenv
-, gnome3
+, gnome
 , gnome-icon-theme
 , hicolor-icon-theme
 , gtk3
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gnome-icon-theme
     hicolor-icon-theme
   ];

pkgs/desktops/cinnamon/muffin/default.nix

@@ -2,7 +2,7 @@
 , cinnamon-desktop
 , glib
 , file
-, gnome3
+, gnome
 , gnome-doc-utils
 , fetchpatch
 , gobject-introspection
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     xorg.xkeyboardconfig
 
     libxkbcommon
-    gnome3.zenity
+    gnome.zenity
     libinput
     libstartup_notification
     libXtst

pkgs/desktops/gnome/apps/accerciser/default.nix

@@ -1,7 +1,7 @@
 { lib
 , fetchurl
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , wrapGAppsHook
 , gobject-introspection
@@ -57,9 +57,9 @@ python3.pkgs.buildPythonApplication rec {
   strictDeps = false;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "accerciser";
-      attrPath = "gnome3.accerciser";
+      attrPath = "gnome.accerciser";
       versionPolicy = "odd-unstable";
     };
   };

pkgs/desktops/gnome/apps/cheese/default.nix

@@ -23,7 +23,7 @@
 , librsvg
 , totem
 , gdk-pixbuf
-, gnome3
+, gnome
 , gnome-desktop
 , libxml2
 , meson
@@ -105,9 +105,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "cheese";
-      attrPath = "gnome3.cheese";
+      attrPath = "gnome.cheese";
     };
   };
 

pkgs/desktops/gnome/apps/file-roller/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive
+{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive
 , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales
 , unzip, cpio }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
 
-  buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus cpio ];
+  buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ];
 
   PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
 
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "file-roller";
-      attrPath = "gnome3.file-roller";
+      attrPath = "gnome.file-roller";
     };
   };
 

pkgs/desktops/gnome/apps/gedit/default.nix

@@ -13,7 +13,7 @@
 , ninja
 , libsoup
 , tepl
-, gnome3
+, gnome
 , gspell
 , perl
 , itstool
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gedit";
-      attrPath = "gnome3.gedit";
+      attrPath = "gnome.gedit";
     };
   };
 

pkgs/desktops/gnome/apps/ghex/default.nix

@@ -5,7 +5,7 @@
 , meson
 , ninja
 , python3
-, gnome3
+, gnome
 , desktop-file-utils
 , appstream-glib
 , gettext
@@ -68,9 +68,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "ghex";
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-books/default.nix

@@ -14,7 +14,7 @@
 , webkitgtk
 , gnome-desktop
 , libgepub
-, gnome3
+, gnome
 , gdk-pixbuf
 , gsettings-desktop-schemas
 , adwaita-icon-theme
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-books";
-      attrPath = "gnome3.gnome-books";
+      attrPath = "gnome.gnome-books";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-boxes/default.nix

@@ -31,7 +31,7 @@
 , gmp
 , gdbm
 , cyrus_sasl
-, gnome3
+, gnome
 , librsvg
 , desktop-file-utils
 , mtools
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
     glib
     glib-networking
     gmp
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gtk-vnc
     gtk3
     gtksourceview4
@@ -129,9 +129,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-calendar/default.nix

@@ -11,7 +11,7 @@
 , python3
 , gettext
 , libxml2
-, gnome3
+, gnome
 , gtk3
 , evolution-data-server
 , libsoup
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-characters/default.nix

@@ -5,7 +5,7 @@
 , ninja
 , pkg-config
 , gettext
-, gnome3
+, gnome
 , glib
 , gtk3
 , pango
@@ -72,9 +72,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-clocks/default.nix

@@ -18,7 +18,7 @@
 , adwaita-icon-theme
 , gnome-desktop
 , geocode-glib
-, gnome3
+, gnome
 , gdk-pixbuf
 , geoclue2
 , libgweather
@@ -71,9 +71,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-clocks";
-      attrPath = "gnome3.gnome-clocks";
+      attrPath = "gnome.gnome-clocks";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-connections/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv
 , fetchurl
-, gnome3
+, gnome
 , meson
 , ninja
 , vala
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "connections";
       attrPath = "gnome-connections";
     };

pkgs/desktops/gnome/apps/gnome-documents/default.nix

@@ -18,7 +18,7 @@
 , gnome-desktop
 , libzapojit
 , libgepub
-, gnome3
+, gnome
 , gdk-pixbuf
 , libsoup
 , docbook_xsl
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
     glib
     gsettings-desktop-schemas
     gdk-pixbuf
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     evince
     libsoup
     webkitgtk
@@ -110,9 +110,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-logs/default.nix

@@ -4,7 +4,7 @@
 , meson
 , ninja
 , pkg-config
-, gnome3
+, gnome
 , glib
 , gtk3
 , wrapGAppsHook
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     gtk3
     systemd
     gsettings-desktop-schemas
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   mesonFlags = [
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-logs";
-      attrPath = "gnome3.gnome-logs";
+      attrPath = "gnome.gnome-logs";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-maps/default.nix

@@ -5,7 +5,7 @@
 , gettext
 , python3
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , gobject-introspection
 , gdk-pixbuf
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     gfbgraph
     gjs
     gnome-online-accounts
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gobject-introspection
     gsettings-desktop-schemas
     gtk3
@@ -88,9 +88,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-music/default.nix

@@ -21,7 +21,7 @@
 , desktop-file-utils
 , appstream-glib
 , itstool
-, gnome3
+, gnome
 , gst_all_1
 , libdazzle
 , libsoup
@@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec {
     gnome-online-accounts
     gobject-introspection
     gdk-pixbuf
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     python3
     grilo
     grilo-plugins
@@ -97,9 +97,9 @@ python3.pkgs.buildPythonApplication rec {
   strictDeps = false;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-nettool/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
+{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
 , libgtop, intltool, itstool, libxml2, nmap, inetutils }:
 
 stdenv.mkDerivation rec {
@@ -13,15 +13,15 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     gtk3 wrapGAppsHook libgtop intltool itstool libxml2
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   propagatedUserEnvPkgs = [ nmap inetutils ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "none";
     };
   };

pkgs/desktops/gnome/apps/gnome-notes/default.nix

@@ -17,7 +17,7 @@
 , curl
 , libhandy
 , webkitgtk
-, gnome3
+, gnome
 , libxml2
 , gsettings-desktop-schemas
 , tracker
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     gnome-online-accounts
     gsettings-desktop-schemas
     evolution-data-server
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   mesonFlags = [
@@ -71,9 +71,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "bijiben";
-      attrPath = "gnome3.gnome-notes";
+      attrPath = "gnome.gnome-notes";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-power-manager/default.nix

@@ -10,7 +10,7 @@
 , python3
 , desktop-file-utils
 , wrapGAppsHook
-, gnome3 }:
+, gnome }:
 
 let
   pname = "gnome-power-manager";
@@ -24,9 +24,9 @@ in stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
     gtk3
     glib
     upower
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   meta = with lib; {

pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix

@@ -9,7 +9,7 @@
 , gtk3
 , gdk-pixbuf
 , gst_all_1
-, gnome3
+, gnome
 , meson
 , ninja
 , python3
@@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-todo/default.nix

@@ -7,7 +7,7 @@
 , python3
 , wrapGAppsHook
 , gettext
-, gnome3
+, gnome
 , glib
 , gtk3
 , libpeas
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libpeas
     gnome-online-accounts
     gsettings-desktop-schemas
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     # Plug-ins
     evolution-data-server
     libxml2
@@ -73,9 +73,9 @@ stdenv.mkDerivation rec {
   preBuild = "ninja src/gtd-vcs-identifier.h";
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/gnome-weather/default.nix

@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , libhandy
 , wrapGAppsHook
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     gobject-introspection
     gnome-desktop
     libgweather
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     geoclue2
     gsettings-desktop-schemas
   ];
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-weather";
-      attrPath = "gnome3.gnome-weather";
+      attrPath = "gnome.gnome-weather";
     };
   };
 

pkgs/desktops/gnome/apps/polari/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme
 , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
 , pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib
-, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
+, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
 
 let
   pname = "polari";
@@ -38,9 +38,9 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/seahorse/default.nix

@@ -11,7 +11,7 @@
 , itstool
 , gnupg
 , libsoup
-, gnome3
+, gnome
 , gpgme
 , python3
 , openldap
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     gcr
     gsettings-desktop-schemas
     gnupg
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gpgme
     libsecret
     avahi
@@ -68,9 +68,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/apps/vinagre/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool
+{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool
 , libsecret, itstool, wrapGAppsHook, librsvg }:
 
 stdenv.mkDerivation rec {
@@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ];
   buildInputs = [
-    gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg
+    gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg
   ];
 
   NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "vinagre";
-      attrPath = "gnome3.vinagre";
+      attrPath = "gnome.vinagre";
     };
   };
 

pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3
+{ lib, stdenv, fetchurl, pkg-config, intltool, gnome
 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   postInstall = '' rm -rf "$out/locale" '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "adwaita-icon-theme";
-      attrPath = "gnome3.adwaita-icon-theme";
+      attrPath = "gnome.adwaita-icon-theme";
     };
   };
 

pkgs/desktops/gnome/core/baobab/default.nix

@@ -14,7 +14,7 @@
 , libxml2
 , wrapGAppsHook
 , itstool
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -43,13 +43,13 @@ stdenv.mkDerivation rec {
     gtk3
     libhandy
     glib
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };

pkgs/desktops/gnome/core/caribou/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2
+{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2
 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook
 , wrapGAppsHook, libgee }:
 
@@ -38,9 +38,9 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/dconf-editor/default.nix

@@ -8,7 +8,7 @@
 , pkg-config
 , glib
 , gtk3
-, gnome3
+, gnome
 , python3
 , dconf
 , libxml2
@@ -53,9 +53,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/empathy/default.nix

@@ -7,7 +7,7 @@
 , glib
 , file
 , librsvg
-, gnome3
+, gnome
 , gdk-pixbuf
 , python3
 , telepathy-glib
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
     libcanberra-gtk3
     telepathy-farstream
     farstream
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gsettings-desktop-schemas
     librsvg
 
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "empathy";
       versionPolicy = "none";
     };

pkgs/desktops/gnome/core/eog/default.nix

@@ -9,7 +9,7 @@
 , libjpeg
 , libpeas
 , libportal
-, gnome3
+, gnome
 , gtk3
 , glib
 , gsettings-desktop-schemas
@@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/epiphany/default.nix

@@ -8,7 +8,7 @@
 , glib
 , icu
 , wrapGAppsHook
-, gnome3
+, gnome
 , libportal
 , libxml2
 , libxslt
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     glib
     glib-networking
     gnome-desktop
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gst_all_1.gst-libav
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-base
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };

pkgs/desktops/gnome/core/evince/default.nix

@@ -13,7 +13,7 @@
 , gdk-pixbuf
 , shared-mime-info
 , itstool
-, gnome3
+, gnome
 , poppler
 , ghostscriptX
 , djvulibre
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };

pkgs/desktops/gnome/core/evolution-data-server/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection
+{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection
 , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit
 , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja
 , libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "evolution-data-server";
       versionPolicy = "odd-unstable";
     };

pkgs/desktops/gnome/core/gdm/default.nix

@@ -13,7 +13,7 @@
 , xorg
 , accountsservice
 , libX11
-, gnome3
+, gnome
 , systemd
 , dconf
 , gtk3
@@ -160,9 +160,9 @@ stdenv.mkDerivation rec {
   DESTDIR = "${placeholder "out"}/dest";
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gdm";
-      attrPath = "gnome3.gdm";
+      attrPath = "gnome.gdm";
     };
 
     # Used in GDM NixOS module

pkgs/desktops/gnome/core/gnome-backgrounds/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }:
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-backgrounds";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; };
+    updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; };
   };
 
   nativeBuildInputs = [ meson ninja pkg-config gettext ];

pkgs/desktops/gnome/core/gnome-bluetooth/default.nix

@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , fetchurl
-, gnome3
+, gnome
 , meson
 , ninja
 , pkg-config
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     udev
     libnotify
     libcanberra-gtk3
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gsettings-desktop-schemas
   ];
 
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-calculator/default.nix

@@ -14,7 +14,7 @@
 , wrapGAppsHook
 , gobject-introspection
 , python3
-, gnome3
+, gnome
 , mpfr
 , gmp
 , libsoup
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     gtksourceview4
     mpfr
     gmp
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     libgee
     gsettings-desktop-schemas
     libsoup
@@ -73,9 +73,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-calculator";
-      attrPath = "gnome3.gnome-calculator";
+      attrPath = "gnome.gnome-calculator";
     };
   };
 

pkgs/desktops/gnome/core/gnome-color-manager/default.nix

@@ -6,7 +6,7 @@
 , gettext
 , itstool
 , desktop-file-utils
-, gnome3
+, gnome
 , glib
 , gtk3
 , libexif
@@ -51,9 +51,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-common/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, which, gnome3, autoconf, automake }:
+{ lib, stdenv, fetchurl, which, gnome, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-common";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; };
+    updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; };
   };
 
   patches = [(fetchurl {

pkgs/desktops/gnome/core/gnome-contacts/default.nix

@@ -19,7 +19,7 @@
 , folks
 , libgdata
 , libxml2
-, gnome3
+, gnome
 , vala
 , meson
 , ninja
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     libxml2
     gnome-online-accounts
     cheese
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     libchamplain
     clutter-gtk
     geocode-glib
@@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-contacts";
-      attrPath = "gnome3.gnome-contacts";
+      attrPath = "gnome.gnome-contacts";
     };
   };
 

pkgs/desktops/gnome/core/gnome-control-center/default.nix

@@ -23,7 +23,7 @@
 , gnome-desktop
 , gnome-online-accounts
 , gnome-settings-daemon
-, gnome3
+, gnome
 , grilo
 , grilo-plugins
 , gsettings-desktop-schemas
@@ -175,9 +175,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-desktop/default.nix

@@ -5,7 +5,7 @@
 , pkg-config
 , libxslt
 , ninja
-, gnome3
+, gnome
 , gtk3
 , glib
 , gettext
@@ -80,9 +80,9 @@ stdenv.mkDerivation rec {
   separateDebugInfo = stdenv.isLinux;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-desktop";
-      attrPath = "gnome3.gnome-desktop";
+      attrPath = "gnome.gnome-desktop";
     };
   };
 

pkgs/desktops/gnome/core/gnome-dictionary/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt
 , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
-, gnome3, gtk3, glib, gsettings-desktop-schemas }:
+, gnome, gtk3, glib, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-dictionary";
@@ -17,12 +17,12 @@ stdenv.mkDerivation rec {
     meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool
     desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43
   ];
-  buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
+  buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-dictionary";
-      attrPath = "gnome3.gnome-dictionary";
+      attrPath = "gnome.gnome-dictionary";
     };
   };
 

pkgs/desktops/gnome/core/gnome-disk-utility/default.nix

@@ -15,7 +15,7 @@
 , python3
 , libnotify
 , itstool
-, gnome3
+, gnome
 , libxml2
 , gsettings-desktop-schemas
 , libcanberra-gtk3
@@ -57,9 +57,9 @@ stdenv.mkDerivation rec {
     libdvdread
     libcanberra-gtk3
     udisks2
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     systemd
-    gnome3.gnome-settings-daemon
+    gnome.gnome-settings-daemon
     gsettings-desktop-schemas
   ];
 
@@ -69,9 +69,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-disk-utility";
-      attrPath = "gnome3.gnome-disk-utility";
+      attrPath = "gnome.gnome-disk-utility";
     };
   };
 

pkgs/desktops/gnome/core/gnome-font-viewer/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, meson, ninja, gettext, fetchurl
 , pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy
-, wrapGAppsHook, gnome3, harfbuzz }:
+, wrapGAppsHook, gnome, harfbuzz }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-font-viewer";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
   preConfigure = "sed -i '2,$ d'  meson-postinstall.sh";
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-font-viewer";
-      attrPath = "gnome3.gnome-font-viewer";
+      attrPath = "gnome.gnome-font-viewer";
     };
   };
 

pkgs/desktops/gnome/core/gnome-initial-setup/default.nix

@@ -6,7 +6,7 @@
 , ninja
 , pkg-config
 , wrapGAppsHook
-, gnome3
+, gnome
 , accountsservice
 , fontconfig
 , gdm
@@ -90,9 +90,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-keyring/default.nix

@@ -17,7 +17,7 @@
 , wrapGAppsHook
 , docbook-xsl-nons
 , docbook_xml_dtd_43
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -86,9 +86,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-keyring";
-      attrPath = "gnome3.gnome-keyring";
+      attrPath = "gnome.gnome-keyring";
     };
   };
 

pkgs/desktops/gnome/core/gnome-online-miners/default.nix

@@ -5,7 +5,7 @@
 , autoreconfHook
 , pkg-config
 , glib
-, gnome3
+, gnome
 , libxml2
 , libgdata
 , grilo
@@ -100,9 +100,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-online-miners";
-      attrPath = "gnome3.gnome-online-miners";
+      attrPath = "gnome.gnome-online-miners";
     };
   };
 

pkgs/desktops/gnome/core/gnome-screenshot/default.nix

@@ -1,6 +1,6 @@
 { lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3
 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
-, gnome3, gsettings-desktop-schemas }:
+, gnome, gsettings-desktop-schemas }:
 
 let
   pname = "gnome-screenshot";
@@ -22,14 +22,14 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
   buildInputs = [
-    gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme
+    gtk3 glib libcanberra-gtk3 libhandy gnome.adwaita-icon-theme
     gsettings-desktop-schemas
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-session/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas
+{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas
 , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
 
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme
-    gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
+    glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme
+    gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy
   ];
 
   postPatch = ''
@@ -56,8 +56,8 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/libexec/gnome-session-binary" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\
-      --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg"
+      --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\
+      --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
   '';
 
   # We move the GNOME sessions to another output since gnome-session is a dependency of
@@ -73,9 +73,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-session";
-      attrPath = "gnome3.gnome-session";
+      attrPath = "gnome.gnome-session";
     };
     providedSessions = [ "gnome" "gnome-xorg" ];
   };

pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix

@@ -5,7 +5,7 @@
 , meson
 , ninja
 , pkg-config
-, gnome3
+, gnome
 , perl
 , gettext
 , gtk3
@@ -119,9 +119,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib
-, gnome3, gnome-menus, substituteAll }:
+, gnome, gnome-menus, substituteAll }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extensions";
@@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gnome-shell/default.nix

@@ -6,7 +6,7 @@
 , meson
 , ninja
 , pkg-config
-, gnome3
+, gnome
 , json-glib
 , gettext
 , libsecret
@@ -208,9 +208,9 @@ stdenv.mkDerivation rec {
 
   passthru = {
     mozillaPlugin = "/lib/mozilla/plugins";
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-shell";
-      attrPath = "gnome3.gnome-shell";
+      attrPath = "gnome.gnome-shell";
     };
   };
 

pkgs/desktops/gnome/core/gnome-software/default.nix

@@ -6,7 +6,7 @@
 , meson
 , ninja
 , gettext
-, gnome3
+, gnome
 , wrapGAppsHook
 , packagekit
 , ostree
@@ -104,9 +104,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.gnome-software";
+      attrPath = "gnome.gnome-software";
     };
   };
 

pkgs/desktops/gnome/core/gnome-system-monitor/default.nix

@@ -15,7 +15,7 @@
 , python3
 , gsettings-desktop-schemas
 , itstool
-, gnome3
+, gnome
 , librsvg
 , gdk-pixbuf
 , libgtop
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     gtkmm3
     libgtop
     gdk-pixbuf
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     librsvg
     gsettings-desktop-schemas
     systemd
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-system-monitor";
-      attrPath = "gnome3.gnome-system-monitor";
+      attrPath = "gnome.gnome-system-monitor";
     };
   };
 

pkgs/desktops/gnome/core/gnome-terminal/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus
+{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus
 , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
 , desktop-file-utils, itstool, wrapGAppsHook, pcre2
 , libxslt, docbook-xsl-nons }:
@@ -26,16 +26,16 @@ stdenv.mkDerivation rec {
   # Silly ./configure, it looks for dbus file from gnome-shell in the
   # installation tree of the package it is configuring.
   postPatch = ''
-    substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
-    substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
+    substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
+    substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml"
   '';
 
   configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-terminal";
-      attrPath = "gnome3.gnome-terminal";
+      attrPath = "gnome.gnome-terminal";
     };
   };
 

pkgs/desktops/gnome/core/gnome-themes-extra/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2
+{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2
 , gdk-pixbuf, hicolor-icon-theme }:
 
 let
@@ -13,14 +13,14 @@ in stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };
 
   nativeBuildInputs = [ pkg-config intltool ];
   buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ];
-  propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ];
+  propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ];
 
   dontDropIconThemeCache = true;
 

pkgs/desktops/gnome/core/gnome-tour/default.nix

@@ -13,7 +13,7 @@
 , appstream-glib
 , wrapGAppsHook
 , python3
-, gnome3
+, gnome
 , libhandy
 , librsvg
 , rustc
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };

pkgs/desktops/gnome/core/gnome-user-share/default.nix

@@ -15,7 +15,7 @@
 , itstool
 , libnotify
 , mod_dnssd
-, gnome3
+, gnome
 , libcanberra-gtk3
 , python3
 }:
@@ -80,9 +80,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 

pkgs/desktops/gnome/core/gucharmap/default.nix

@@ -11,7 +11,7 @@
 , desktop-file-utils
 , gtk-doc
 , wrapGAppsHook
-, gnome3
+, gnome
 , itstool
 , libxml2
 , yelp-tools
@@ -93,7 +93,7 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };

pkgs/desktops/gnome/core/libgnome-keyring/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }:
+{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }:
 
 let
   pname = "libgnome-keyring";

pkgs/desktops/gnome/core/mutter/3.34/default.nix

@@ -3,7 +3,7 @@
 , substituteAll
 , lib, stdenv
 , pkg-config
-, gnome3
+, gnome
 , pantheon
 , gettext
 , gobject-introspection