gnome: rename from gnome3

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

213 files changed, 430 insertions, 428 deletions

diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix
index 65eede25832..a5800b01a30 100644
--- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix
+++ b/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
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
index c2e50c65557..4208b92ae2d 100644
--- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
@@ -18,7 +18,7 @@
 , libxklavier
 , networkmanager
 , libwacom
-, gnome3
+, gnome
 , wrapGAppsHook
 , tzdata
 , glibc
diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
index 39dee473cc5..b70673253ed 100644
--- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
+++ b/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
diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix
index 3c01d003937..1a1e8132bd6 100644
--- a/pkgs/desktops/cinnamon/cjs/default.nix
+++ b/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
diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix
index f52b0556d56..f4a04cf33a8 100644
--- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix
+++ b/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
diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix
index 8d55e81c58c..e04a1baa669 100644
--- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix
+++ b/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
   ];
diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix
index 2df5f875b41..5470933d619 100644
--- a/pkgs/desktops/cinnamon/muffin/default.nix
+++ b/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
diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome/apps/accerciser/default.nix
index e634037b871..d81b8466194 100644
--- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix
+++ b/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";
     };
   };
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix
index 75c3060f51d..d0a9d6aaabb 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix
index c6a2a3a6400..6af1994fb06 100644
--- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix
index 1458d509e61..a8479e9cdca 100644
--- a/pkgs/desktops/gnome-3/apps/gedit/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix
index fb8cf0a1a1c..500e60feb75 100644
--- a/pkgs/desktops/gnome-3/apps/ghex/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome/apps/gnome-books/default.nix
index 2b0aedc9e3e..0e8b322cf5e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix
index 779bfe6886d..605275be7de 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix
index fae4149a131..3e80575a33d 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch
index 5065295b57b..5065295b57b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch
+++ b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch
diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix
index b5abee28380..5cbd58d602a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix
index cd91cef6687..d9a749a24b0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix
index 17f11d0efdc..abdf751baeb 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix
+++ b/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";
     };
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome/apps/gnome-documents/default.nix
index 3172ae27123..3f7ac34696b 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix
index 20b27b2ddd0..da06eb4404c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix
index 673013c8e60..2818215a4ff 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix
index b50ce59980f..51e3d5a9cdf 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix
index 6fca1c0eea5..ca75b7aae07 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
+++ b/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";
     };
   };
diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix
index afeddd1bb99..6af206069e2 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix
index cb79a772b79..0337f70a20e 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
+++ b/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; {
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix
index 3b34fae714c..29f7aa6e9ee 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix
index 34aed52fa85..885f21cf3ec 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix
index 6cbfea0f5cf..39c10e82a1c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix
index 727a82e5ff3..0675ccb2f82 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch
index 0fb09eb154a..0fb09eb154a 100644
--- a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch
+++ b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix
index e44f094be1b..d46aed7bbe9 100644
--- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix
index 49abb2f1a70..31e198783e0 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix
index ceffe2f012b..04f8a7a3c37 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix
index 386502a854b..8d0f9459c3b 100644
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/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;
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix
index 88260f05acf..5985ff82266 100644
--- a/pkgs/desktops/gnome-3/core/caribou/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix
index aab9a0db42b..165980d7e9c 100644
--- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome/core/empathy/default.nix
index 8ebb5c3f64f..fbfee37cd13 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/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";
     };
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix
index 671a6645674..426a8783352 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix
index 349a1c024e4..f286d384c4e 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/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;
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix
index 59eb31e1918..3d7f3e0b835 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/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;
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
index dc3f4b493b0..0ed3565d7f0 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/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";
     };
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch
index 33423551659..33423551659 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
index 4e345c3cb3c..4e345c3cb3c 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix
index 6c1db6cebd9..f3044977349 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/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
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch
index d649556fe9e..d649556fe9e 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gdm/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch
index 401b6aea0c2..401b6aea0c2 100644
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch
+++ b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch
index 66071aa4af8..66071aa4af8 100644
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch
+++ b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch
index 58481f0730f..58481f0730f 100644
--- a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch
+++ b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override
index 8c17f494b0f..8c17f494b0f 100644
--- a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override
+++ b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override
diff --git a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/pkgs/desktops/gnome/core/gdm/reset-environment.patch
index 61defd9c4bc..61defd9c4bc 100644
--- a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch
+++ b/pkgs/desktops/gnome/core/gdm/reset-environment.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix
index 2ce52911595..370cd14e467 100644
--- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
+++ b/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 ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
index e057cc61da8..07b77c04994 100644
--- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix
index 4bf317a4a26..7e19e9523ce 100644
--- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix
index 73db99f3d37..dae367f1d5b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome/core/gnome-common/default.nix
index 53e3ed47ebe..cb50396a404 100644
--- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix
+++ b/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 {
diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix
index 3146ca717d3..62a43d20d58 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix
index 371f2d794a0..6170f53c716 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch
index a6787477b81..a6787477b81 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch
index 57eb4b3d44a..57eb4b3d44a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix
index 4294e2db240..56bd074c2cb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix
index 8ff4145a271..a399c4e8537 100644
--- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix
index 87b89c3a05b..c11a1df883a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix
index 6e9b6d22f57..622a7de1bff 100644
--- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch
index 23237595225..23237595225 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix
index 6cf549dc5ca..6d57e29a596 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf
index a06b37e100e..a06b37e100e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf
+++ b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf
diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix
index 833f58f74a4..8c9815509e2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix
index 3cc85053bce..95fdf35b883 100644
--- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
index 8411b2edecb..8411b2edecb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix
index 35e7b1a0b02..5b02fda3e32 100644
--- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix
index 6a274e35bf5..6a274e35bf5 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix
+++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix
index 49363568eab..c1ebc436207 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix
+++ b/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" ];
   };
diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch
index 320b3024dee..320b3024dee 100644
--- a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
index d7e549e2893..e091cf2365a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch
index 2229302cab7..2229302cab7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch
index 8f3951af2da..8f3951af2da 100644
--- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch
+++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix
index 035633d676a..6c38b790959 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch
index 555664e8ae2..555664e8ae2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
+++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix
index 078582f439f..66eaafb2cc7 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
index e17a608a2d8..e17a608a2d8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch
index 6d888725b5d..6d888725b5d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch
+++ b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch
index bc494caea9d..bc494caea9d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch
+++ b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix
index d26dc801d69..64cd214e809 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch
index 6f443a8a43e..6f443a8a43e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix
index 44e24e7cdf6..77579be6272 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix
index de5cb767d54..ab3e3aecc03 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/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";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix
index 7b42d724593..53f775833a8 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/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;
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix
index 4e6c58a14e8..7440749e0a9 100644
--- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix
+++ b/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;
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix
index 54fcf531c65..211326cfcdb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix
+++ b/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}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix
index aac5a43e433..336a4d260c4 100644
--- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix
+++ b/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;
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix
index f4b76996ac4..aa3c7ed3981 100644
--- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix
+++ b/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";
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
index 3691c034d1e..3691c034d1e 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch
index 28f89ac7c0c..28f89ac7c0c 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
index 9f78a324d9d..9f78a324d9d 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
index cd98d395041..cd98d395041 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
index 138970ddda0..138970ddda0 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
index 6d88f0f5e76..6d88f0f5e76 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch
index 8376fc649b5..8376fc649b5 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch
+++ b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome/core/mutter/3.34/default.nix
index 1f4ca5d3213..42f07d45e62 100644
--- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/3.34/default.nix
@@ -3,7 +3,7 @@
 , substituteAll
 , lib, stdenv
 , pkg-config
-, gnome3
+, gnome
 , pantheon
 , gettext
 , gobject-introspection
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index 2dda38bb4e7..9f6a64ef182 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -4,7 +4,7 @@
 , runCommand
 , lib, stdenv
 , pkg-config
-, gnome3
+, gnome
 , gettext
 , gobject-introspection
 , cairo
@@ -153,9 +153,9 @@ let self = stdenv.mkDerivation rec {
       '';
     };
 
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch
index 7374e1b8693..7374e1b8693 100644
--- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch
+++ b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch
diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch
index 6ac0a431f61..6ac0a431f61 100644
--- a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/mutter/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix
index 29c44ecd6e9..f3ccdbce98c 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome/core/nautilus/default.nix
@@ -11,7 +11,7 @@
 , gtk3
 , libhandy
 , libportal
-, gnome3
+, gnome
 , gnome-autoar
 , glib-networking
 , shared-mime-info
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     gexiv2
     glib-networking
     gnome-desktop
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gsettings-desktop-schemas
     gst_all_1.gst-plugins-base
     gtk3
@@ -102,9 +102,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch
index e1313999675..e1313999675 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch
+++ b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch
index dc9874359b2..dc9874359b2 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch
+++ b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch
index 6fe651b9cbb..6fe651b9cbb 100644
--- a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch
+++ b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch
diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix
index da82d30214e..f43df23f44a 100644
--- a/pkgs/desktops/gnome-3/core/rygel/default.nix
+++ b/pkgs/desktops/gnome/core/rygel/default.nix
@@ -23,7 +23,7 @@
 , systemd
 , tracker
 , shared-mime-info
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -93,9 +93,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix
index 59d61febc06..91ac4f14b22 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome/core/simple-scan/default.nix
@@ -19,7 +19,7 @@
 , libxml2
 , sane-backends
 , vala
-, gnome3
+, gnome
 , gobject-introspection
 }:
 
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     gdk-pixbuf
     colord
     glib
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gusb
     gtk3
     libhandy
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "simple-scan";
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix
index 73097f99e51..c42b6964bf6 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome/core/sushi/default.nix
@@ -5,7 +5,7 @@
 , gettext
 , gobject-introspection
 , glib
-, gnome3
+, gnome
 , gtksourceview4
 , gjs
 , webkitgtk
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     gtk3
-    gnome3.evince
+    gnome.evince
     icu
     harfbuzz
     gjs
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "sushi";
-      attrPath = "gnome3.sushi";
+      attrPath = "gnome.sushi";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix
index a98265ff508..f7541fe12ed 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome/core/totem/default.nix
@@ -17,7 +17,7 @@
 , itstool
 , libxml2
 , vala
-, gnome3
+, gnome
 , grilo
 , grilo-plugins
 , libpeas
@@ -107,9 +107,9 @@ stdenv.mkDerivation rec {
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "totem";
-      attrPath = "gnome3.totem";
+      attrPath = "gnome.totem";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix
index c5e859954ff..7c9b4eb839c 100644
--- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix
@@ -5,7 +5,7 @@
 , itstool
 , libxml2
 , libxslt
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix
index 1e1d679f852..f4df80f5611 100644
--- a/pkgs/desktops/gnome-3/core/yelp/default.nix
+++ b/pkgs/desktops/gnome/core/yelp/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib
-, gnome3, sqlite
+, gnome, sqlite
 , itstool, libxml2, libxslt, gst_all_1
 , wrapGAppsHook }:
 
@@ -15,13 +15,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ];
   buildInputs = [
     gtk3 glib webkitgtk sqlite
-    libxml2 libxslt gnome3.yelp-xsl
-    gnome3.adwaita-icon-theme
+    libxml2 libxslt gnome.yelp-xsl
+    gnome.adwaita-icon-theme
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "yelp";
     };
   };
diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix
index d02cb581cb8..51ad81a77a4 100644
--- a/pkgs/desktops/gnome-3/core/zenity/default.nix
+++ b/pkgs/desktops/gnome/core/zenity/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , pkg-config
 , libxml2
-, gnome3
+, gnome
 , gtk3
 , yelp-tools
 , gettext
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "zenity";
-      attrPath = "gnome3.zenity";
+      attrPath = "gnome.zenity";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome/default.nix
index 7d72e16c326..b529a65026d 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -20,7 +20,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
-  gnome3 = self // { recurseForDerivations = false; };
 
 # ISO installer
 # installerIso = callPackage ./installer.nix {};
@@ -330,9 +329,9 @@ lib.makeScope pkgs.newScope (self: with self; {
   pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01
 
   # added 2019-08-25
-  corePackages = throw "gnome3.corePackages is removed since 2019-08-25: please use `services.gnome3.core-shell.enable`";
-  optionalPackages = throw "gnome3.optionalPackages is removed since 2019-08-25: please use `services.gnome3.core-utilities.enable`";
-  gamesPackages = throw "gnome3.gamesPackages is removed since 2019-08-25: please use `services.gnome3.games.enable`";
+  corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`";
+  optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`";
+  gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`";
 
   nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream";
 
@@ -361,4 +360,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mutter328 = throw "Removed as Pantheon is upgraded to mutter334.";
 
   gnome-getting-started-docs = throw "Removed in favour of gnome-tour.";
+
+  # Added 2021-05-07
+  gnome3 = self // { recurseForDerivations = false; };
 })
diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome/devtools/anjuta/default.nix
index 4802287cb12..5b841557b6b 100644
--- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome/devtools/anjuta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool,
+{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, gjs, flex, bison, libxml2, intltool,
   gdl, libgda, gtksourceview, gsettings-desktop-schemas,
   itstool, python3, ncurses, makeWrapper }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; };
+    updateScript = gnome.updateScript { packageName = "anjuta"; attrPath = "gnome.anjuta"; };
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix
index 9a68f151b4a..46491cffc5f 100644
--- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix
@@ -3,7 +3,7 @@
 , meson
 , ninja
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , wrapGAppsHook
 , glib
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     gtk3
     webkitgtk
     amtk
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gsettings-desktop-schemas
   ];
 
@@ -64,9 +64,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "devhelp";
-      attrPath = "gnome3.devhelp";
+      attrPath = "gnome.devhelp";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix
index 6349a318456..501aaa91c97 100644
--- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix
+++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
+{ lib, stdenv, fetchurl, gnome, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-devel-docs";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; };
+    updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; };
   };
 
   buildInputs = [ intltool itstool libxml2 ];
diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
index fa1d89173fd..57d78bf756a 100644
--- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-EasyScreenCast";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-gi-path.patch;
-      gnomeShell = gnome3.gnome-shell;
+      gnomeShell = gnome.gnome-shell;
     })
   ];
 
diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch
index 2d32021b6c6..2d32021b6c6 100644
--- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch
diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix
index aaf8c92c672..0906d762956 100644
--- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix
+++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-appindicator";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "AppIndicator/KStatusNotifierItem support for GNOME Shell";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ jonafato ];
-    platforms = gnome3.gnome-shell.meta.platforms;
+    platforms = gnome.gnome-shell.meta.platforms;
     homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
index 851a816c61c..851a816c61c 100644
--- a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix
+++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch
index 5d8584f52a6..5d8584f52a6 100644
--- a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch
+++ b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch
diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix
index 41155391f89..3085a4461e7 100644
--- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix
+++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-caffeine";
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix
index f6adf85de4d..779d7506abf 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix
@@ -4,7 +4,7 @@
 , ninja
 , jq
 , python3
-, gnome3
+, gnome
 , wrapGAppsHook
 , gobject-introspection
 }:
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gnome3.gnome-shell
+    gnome.gnome-shell
     python
     pygobject3
     requests
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "chrome-gnome-shell";
     };
   };
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     description = "GNOME Shell integration for Chrome";
     homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome";
     longDescription = ''
-      To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>.
+      To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome.chrome-gnome-shell.enable</option> to <literal>true</literal>.
     '';
     license = licenses.gpl3;
     maintainers = teams.gnome.members;
diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix
index ee64fc5113d..ee64fc5113d 100644
--- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix
+++ b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix
index 6d3a752c886..3e02d33857a 100644
--- a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix
+++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, gnome3, gettext, glib }:
+{ lib, stdenv, fetchzip, gnome, gettext, glib }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-clock-override";
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ rhoriguchi ];
     homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override";
-    broken = versionOlder gnome3.gnome-shell.version "3.18";
+    broken = versionOlder gnome.gnome-shell.version "3.18";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
index 45233e52f89..45233e52f89 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix
index 7a9dc066cc7..7a9dc066cc7 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix
+++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix
index 0a9145de3db..0a9145de3db 100644
--- a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix
+++ b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix
index 0e0dab64be1..90e8bffeec9 100644
--- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix
+++ b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchgit, gettext, gnome3 }:
+{ lib, stdenv, fetchgit, gettext, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-draw-on-your-screen";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "A drawing extension for GNOME Shell";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ericdallo ahuzik ];
-    platforms = gnome3.gnome-shell.meta.platforms;
+    platforms = gnome.gnome-shell.meta.platforms;
     homepage = "https://framagit.org/abakkk/DrawOnYourScreen";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix
index 8cd567a590d..a994e427fb0 100644
--- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
+++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-drop-down-terminal";
diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch
index 3544c91ee89..3544c91ee89 100644
--- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch
+++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch
diff --git a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix
index bf637ecab18..f31e170b975 100644
--- a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix
+++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome3, glib }:
+{ lib, stdenv, fetchFromGitHub, gnome, glib }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-dynamic-panel-transparency";
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ rhoriguchi ];
     homepage = "https://github.com/ewlsh/dynamic-panel-transparency";
-    broken = versionOlder gnome3.gnome-shell.version "3.36";
+    broken = versionOlder gnome.gnome-shell.version "3.36";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix
index 5470dc996be..5470dc996be 100644
--- a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix
+++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix
index f30e2f6f8a2..f30e2f6f8a2 100644
--- a/pkgs/desktops/gnome-3/extensions/freon/default.nix
+++ b/pkgs/desktops/gnome/extensions/freon/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
index f8a8803435b..302b21f2aef 100755
--- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix
+++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, gnome3, glib }:
+{ lib, stdenv, fetchFromGitLab, gnome, glib }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-fuzzy-app-search";
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ rhoriguchi ];
     homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search";
-    broken = versionOlder gnome3.gnome-shell.version "3.18";
+    broken = versionOlder gnome.gnome-shell.version "3.18";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch
index 1795f998c9b..1795f998c9b 100755
--- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch
+++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index d432043d380..c924b4e3eca 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -12,7 +12,7 @@
 , glib-networking
 , gtk3
 , openssh
-, gnome3
+, gnome
 , gjs
 , nixosTests
 }:
@@ -55,11 +55,11 @@ stdenv.mkDerivation rec {
     gtk3
     gsound
     gjs # for running daemon
-    gnome3.evolution-data-server # for libebook-contacts typelib
+    gnome.evolution-data-server # for libebook-contacts typelib
   ];
 
   mesonFlags = [
-    "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib"
+    "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib"
     "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}"
     "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
     "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch
index 58c02a92eb2..58c02a92eb2 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch
+++ b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch
index 78e1ad96d74..78e1ad96d74 100644
--- a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch
+++ b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch
diff --git a/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix b/pkgs/desktops/gnome/extensions/hot-edge/default.nix
index aaa5870996a..aaa5870996a 100644
--- a/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix
+++ b/pkgs/desktops/gnome/extensions/hot-edge/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
index 00c67421e54..820d96988c9 100644
--- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-icon-hider";
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
     description = "Icon Hider is a GNOME Shell extension for managing status area items";
     license = licenses.bsd3;
     maintainers = with maintainers; [ jonafato ];
-    platforms = gnome3.gnome-shell.meta.platforms;
+    platforms = gnome.gnome-shell.meta.platforms;
     homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider";
-    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix
index 82551efef3c..82551efef3c 100644
--- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix
+++ b/pkgs/desktops/gnome/extensions/impatience/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome/extensions/material-shell/default.nix
index 87b9a3c1507..9b683c1af6b 100644
--- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix
+++ b/pkgs/desktops/gnome/extensions/material-shell/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, gnome3 }:
+{ stdenv, lib, fetchFromGitHub, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-material-shell";
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ benley ];
     homepage = "https://github.com/material-shell/material-shell";
-    platforms = gnome3.gnome-shell.meta.platforms;
+    platforms = gnome.gnome-shell.meta.platforms;
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix
index 9ab2168d2dc..b0dfc9b8dec 100644
--- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix
+++ b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , nix-update-script
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
     description = "A simple MPRIS indicator button for GNOME Shell";
     license = licenses.gpl3;
     maintainers = with maintainers; [ worldofpeace ];
-    platforms = gnome3.gnome-shell.meta.platforms;
+    platforms = gnome.gnome-shell.meta.platforms;
     homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button";
-    broken = versionOlder gnome3.gnome-shell.version "3.34";
+    broken = versionOlder gnome.gnome-shell.version "3.34";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
index f663aa8977b..fd0d2dbb578 100644
--- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix
+++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, glib, gnome3, unzip }:
+{ lib, stdenv, fetchFromGitLab, glib, gnome, unzip }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-night-theme-switcher";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ unzip ];
-  buildInputs = [ glib gnome3.gnome-shell ];
+  buildInputs = [ glib gnome.gnome-shell ];
 
   uuid = "nightthemeswitcher@romainvigier.fr";
 
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
index ad588be18ce..ad588be18ce 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix
+++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch
index fb2d3d57e51..fb2d3d57e51 100644
--- a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch
+++ b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome/extensions/noannoyance/default.nix
index 4763d905755..4763d905755 100644
--- a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix
+++ b/pkgs/desktops/gnome/extensions/noannoyance/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix
index 201628b4b42..201628b4b42 100644
--- a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix
+++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
index d1647740347..93ffcda830a 100644
--- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, glib, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, glib, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-pidgin-im-integration";
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ];
-    broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix
index e310f5dcf10..e310f5dcf10 100644
--- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix
+++ b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
index e58d8ce6e42..e58d8ce6e42 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix
+++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch
index 1971bf1e5e7..1971bf1e5e7 100644
--- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch
+++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
index 3935150c57e..e7b5e8a1a9c 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix
+++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }:
+{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-system-monitor";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./paths_and_nonexisting_dirs.patch;
-      clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️
+      clutter_path = gnome.mutter.libdir; # this should not be used in settings but 🤷‍♀️
       gtop_path = "${libgtop}/lib/girepository-1.0";
       glib_net_path = "${glib-networking}/lib/girepository-1.0";
     })
diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch
index 280af965af3..280af965af3 100644
--- a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch
+++ b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
index 68d07e2d142..68d07e2d142 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch
index 2ea54f4b089..2ea54f4b089 100644
--- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch
+++ b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix
index dcea4c69ff8..c1ca77d9d73 100644
--- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix
+++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, glib, gnome3 }:
+{ stdenv, lib, fetchFromGitHub, glib, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-tilingnome-unstable";
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ benley ];
     homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome";
-    platforms = gnome3.gnome-shell.meta.platforms;
+    platforms = gnome.gnome-shell.meta.platforms;
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome/extensions/timepp/default.nix
index 94b8540c1bf..cb4234a2513 100644
--- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix
+++ b/pkgs/desktops/gnome/extensions/timepp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-timepp";
diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
index 084548e1a10..084548e1a10 100644
--- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
+++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index 79d7a335239..1fbd31ec10a 100644
--- a/pkgs/desktops/gnome-3/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }:
+{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-unite";
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ rhoriguchi ];
     homepage = "https://github.com/hardpixel/unite-shell";
-    broken = versionOlder gnome3.gnome-shell.version "3.32";
+    broken = versionOlder gnome.gnome-shell.version "3.32";
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
index 42f226e9677..0e71345bb8a 100644
--- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix
+++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, gnome }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-window-corner-preview";
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ jtojnar ];
     homepage = "https://github.com/medenagan/window-corner-preview";
-    broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix
index 3f0e9e71b57..3f0e9e71b57 100644
--- a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix
+++ b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix
index eb1d6e7e319..eb1d6e7e319 100644
--- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix
+++ b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix
diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome/find-latest-version.py
index 3078999e3e5..3078999e3e5 100644
--- a/pkgs/desktops/gnome-3/find-latest-version.py
+++ b/pkgs/desktops/gnome/find-latest-version.py
diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix
index bb513df4c7a..8893846698e 100644
--- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix
+++ b/pkgs/desktops/gnome/games/aisleriot/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchFromGitLab
 , pkg-config
-, gnome3
+, gnome
 , itstool
 , gtk3
 , wrapGAppsHook
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix
index 802d92bf19a..43d9aaa7680 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome/games/atomix/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3
-, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
+, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
 
 let
   pname = "atomix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ];
-  buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
+  buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ];
 
   postPatch = ''
     chmod +x meson_post_install.py
@@ -21,9 +21,9 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix
index 9f6ea6aac04..f01d137979e 100644
--- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome/games/five-or-more/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook
+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook
 , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     vala
   ];
   buildInputs = [
-    gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme
+    gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme
   ];
 
   postPatch = ''
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "five-or-more";
-      attrPath = "gnome3.five-or-more";
+      attrPath = "gnome.five-or-more";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix
index 17dc8fe7c2c..2c6899ee1aa 100644
--- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
+{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
 , gettext, meson, gsound, librsvg, itstool, vala
 , python3, ninja, desktop-file-utils }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     pkg-config wrapGAppsHook gettext meson itstool vala
     ninja python3 desktop-file-utils
   ];
-  buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ];
+  buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "four-in-a-row";
-      attrPath = "gnome3.four-in-a-row";
+      attrPath = "gnome.four-in-a-row";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix
index c8bea5a98d2..c632bce407b 100644
--- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix
@@ -11,7 +11,7 @@
 , itstool
 , libxml2
 , python3
-, gnome3
+, gnome
 , glib
 , gtk4
 , librsvg
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     glib
     gtk4
     librsvg
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   postPatch = ''
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-chess";
-      attrPath = "gnome3.gnome-chess";
+      attrPath = "gnome.gnome-chess";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix
index 4bafc3b4a8d..bb4cdae8fa3 100644
--- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils
+{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils
 , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support
 , meson, ninja, python3
 }:
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config vala meson ninja python3 wrapGAppsHook
     gettext itstool libxml2 appstream-glib desktop-file-utils
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
   buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ];
 
@@ -27,9 +27,9 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
index d5d2de53e47..7ef68e470e1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
+{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
 , librsvg, gettext, itstool, libxml2
 , meson, ninja, glib, vala, desktop-file-utils
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja vala desktop-file-utils
-    pkg-config gnome3.adwaita-icon-theme
+    pkg-config gnome.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
     glib # for glib-compile-schemas
   ];
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix
index f074fb08daa..6a7168badbf 100644
--- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook
+{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome, gtk3, wrapGAppsHook
 , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     meson ninja vala gobject-introspection pkg-config gettext itstool python3
     libxml2 wrapGAppsHook desktop-file-utils
   ];
-  buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ];
+  buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-mines";
-      attrPath = "gnome3.gnome-mines";
+      attrPath = "gnome.gnome-mines";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix
index c3d9fb19725..34b50f2244f 100644
--- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , fetchpatch
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , wrapGAppsHook
 , librsvg
@@ -62,15 +62,15 @@ stdenv.mkDerivation rec {
     librsvg
     gsound
     clutter-gtk
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     libgee
     libgnome-games-support
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-nibbles";
-      attrPath = "gnome3.gnome-nibbles";
+      attrPath = "gnome.gnome-nibbles";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix
index 1a49ee38760..c9f7cbfc213 100644
--- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , wrapGAppsHook
 , librsvg
@@ -57,9 +57,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-robots";
-      attrPath = "gnome3.gnome-robots";
+      attrPath = "gnome.gnome-robots";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix
index 101f3c4f2bd..3bd0ec3b3cd 100644
--- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook
+{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome, wrapGAppsHook
 , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-sudoku";
-      attrPath = "gnome3.gnome-sudoku";
+      attrPath = "gnome.gnome-sudoku";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix
index 91bd9637344..c3e78ff2014 100644
--- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , fetchpatch
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , wrapGAppsHook
 , librsvg
@@ -55,13 +55,13 @@ stdenv.mkDerivation rec {
     gtk3
     librsvg
     gsound
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-taquin";
-      attrPath = "gnome3.gnome-taquin";
+      attrPath = "gnome.gnome-taquin";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix
index 9ae73773799..a1cdf98d9a1 100644
--- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
+{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook
 , libxml2, gettext, itstool, meson, ninja, python3
 , vala, desktop-file-utils
 }:
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; };
+    updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; };
   };
 
   nativeBuildInputs = [
-    wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme
+    wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme
     pkg-config gettext meson ninja python3 vala desktop-file-utils
   ];
   buildInputs = [
diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix
index 8369c571f54..1dc07bae26b 100644
--- a/pkgs/desktops/gnome-3/games/hitori/default.nix
+++ b/pkgs/desktops/gnome/games/hitori/default.nix
@@ -3,7 +3,7 @@
 , meson
 , ninja
 , pkg-config
-, gnome3
+, gnome
 , glib
 , gtk3
 , cairo
@@ -50,9 +50,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix
index 443a417da50..d7e3930eae1 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome/games/iagno/default.nix
@@ -3,7 +3,7 @@
 , fetchpatch
 , pkg-config
 , gtk3
-, gnome3
+, gnome
 , gdk-pixbuf
 , librsvg
 , wrapGAppsHook
@@ -54,16 +54,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     gdk-pixbuf
     librsvg
     gsound
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "iagno";
-      attrPath = "gnome3.iagno";
+      attrPath = "gnome.iagno";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix
index 7e43583d529..94b71f0e856 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome/games/lightsoff/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
+{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook
 , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib
 , meson, ninja, python3 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2
     meson ninja python3
   ];
-  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ];
+  buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
@@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "lightsoff";
-      attrPath = "gnome3.lightsoff";
+      attrPath = "gnome.lightsoff";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix
index de3d67b58bf..d54c49eafee 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf
+{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf
 , librsvg, gsound, libmanette
 , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
 , meson, ninja, python3, vala, desktop-file-utils
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja python3 vala desktop-file-utils
-    pkg-config gnome3.adwaita-icon-theme
+    pkg-config gnome.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
   ];
   buildInputs = [
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix
index d29ac55ce28..50fab598153 100644
--- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix
+++ b/pkgs/desktops/gnome/games/swell-foop/default.nix
@@ -8,7 +8,7 @@
 , glib
 , gtk3
 , libgnome-games-support
-, gnome3
+, gnome
 , desktop-file-utils
 , clutter
 , clutter-gtk
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     glib
     gtk3
     libgnome-games-support
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     clutter
     clutter-gtk
   ];
@@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix
index e5aad262aa9..3e2abc87304 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome/games/tali/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf
+{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf
 , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook
 , meson, ninja, python3, desktop-file-utils
 }:
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; };
+    updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; };
   };
 
   nativeBuildInputs = [
     meson ninja python3 desktop-file-utils
-    pkg-config gnome3.adwaita-icon-theme
+    pkg-config gnome.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
   ];
   buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ];
diff --git a/pkgs/desktops/gnome-3/installer.nix b/pkgs/desktops/gnome/installer.nix
index 4999e1f3343..4999e1f3343 100644
--- a/pkgs/desktops/gnome-3/installer.nix
+++ b/pkgs/desktops/gnome/installer.nix
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix
index 3abddaedaec..a40cd30eb8d 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome/misc/geary/default.nix
@@ -24,7 +24,7 @@
 , json-glib
 , itstool
 , libgee
-, gnome3
+, gnome
 , webkitgtk
 , python3
 , gnutls
@@ -144,9 +144,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix
index 49205751591..8f73bdaeb7d 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome/misc/gitg/default.nix
@@ -15,7 +15,7 @@
 , gtksourceview
 , gsettings-desktop-schemas
 , adwaita-icon-theme
-, gnome3
+, gnome
 , gtkspell3
 , shared-mime-info
 , libgee
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
     };
   };
diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix
index 21dedba16ad..d414266a9d9 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix
@@ -18,7 +18,7 @@
 , gucharmap
 , tracker
 , polkit
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -63,9 +63,9 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
index 8d5f07579c6..8a74c05dfea 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , pkg-config
-, gnome3
+, gnome
 , gtk3
 , glib
 , gobject-introspection
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; };
+    updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; };
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
index 501000f204f..7e578f27cd2 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
@@ -7,7 +7,7 @@
 , gnome-desktop
 , gnome-panel
 , gnome-session
-, gnome3
+, gnome
 , gsettings-desktop-schemas
 , gtk3
 , ibus
@@ -120,9 +120,9 @@ let
     PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
 
     passthru = {
-      updateScript = gnome3.updateScript {
+      updateScript = gnome.updateScript {
         packageName = pname;
-        attrPath = "gnome3.${pname}";
+        attrPath = "gnome.${pname}";
         versionPolicy = "odd-unstable";
       };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix
index 53be2df471b..6e0aa78e6fd 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome3, packagekit, polkit
+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome, packagekit, polkit
 , gtk3, systemd, wrapGAppsHook, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = "gnome-packagekit";
-      attrPath = "gnome3.gnome-packagekit";
+      attrPath = "gnome.gnome-packagekit";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix
index 113849b935a..4e42f91e1e3 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix
@@ -8,7 +8,7 @@
 , glib
 , gnome-desktop
 , gnome-menus
-, gnome3
+, gnome
 , gtk3
 , itstool
 , libgweather
@@ -82,9 +82,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch b/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch
index 81e037ee690..81e037ee690 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch
+++ b/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
index 5d57d7616f0..460ab47733c 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix
@@ -5,7 +5,7 @@
 , gdk-pixbuf
 , gettext
 , glib
-, gnome3
+, gnome
 , gobject-introspection
 , gsettings-desktop-schemas
 , gtk3
@@ -43,12 +43,12 @@ python3Packages.buildPythonApplication rec {
   buildInputs = [
     gdk-pixbuf
     glib
-    gnome3.gnome-desktop
-    gnome3.gnome-settings-daemon
-    gnome3.gnome-shell
+    gnome.gnome-desktop
+    gnome.gnome-settings-daemon
+    gnome.gnome-shell
     # Makes it possible to select user themes through the `user-theme` extension
-    gnome3.gnome-shell-extensions
-    gnome3.mutter
+    gnome.gnome-shell-extensions
+    gnome.mutter
     gsettings-desktop-schemas
     gtk3
     libhandy
@@ -65,9 +65,9 @@ python3Packages.buildPythonApplication rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
     };
   };
 
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix
index 15fcfbfe390..15fcfbfe390 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome/misc/gpaste/default.nix
diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch
index 46e30ce2e2c..46e30ce2e2c 100644
--- a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch
+++ b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix
index cc054a983c6..88fb31c4333 100644
--- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
+++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gtk3, intltool
-, gnome3, enchant, isocodes, gsettings-desktop-schemas }:
+, gnome, enchant, isocodes, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   pname = "gtkhtml";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   };
 
   passthru = {
-    updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; };
+    updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; };
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme
+  buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme
                   gsettings-desktop-schemas ];
 
   propagatedBuildInputs = [ enchant isocodes ];
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix
index f594c1b0a4d..dd65f858b6d 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix
@@ -6,7 +6,7 @@
 , libgee
 , gettext
 , vala
-, gnome3
+, gnome
 , libintl
 , meson
 , ninja
@@ -41,9 +41,9 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix
index 36c6b66d5ca..702b7ffb38b 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/default.nix
+++ b/pkgs/desktops/gnome/misc/metacity/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , gettext
 , glib
-, gnome3
+, gnome
 , gsettings-desktop-schemas
 , gtk3
 , xorg
@@ -55,9 +55,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/pkgs/desktops/gnome/misc/metacity/fix-paths.patch
index ff3a244e67d..ff3a244e67d 100644
--- a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch
+++ b/pkgs/desktops/gnome/misc/metacity/fix-paths.patch
diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix
index 0008f66e9ad..40c1d4c767a 100644
--- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix
+++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix
@@ -9,7 +9,7 @@
 , ncurses
 , nautilus
 , gtk3
-, gnome3
+, gnome
 }:
 
 stdenv.mkDerivation rec {
@@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
   PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = pname;
-      attrPath = "gnome3.${pname}";
+      attrPath = "gnome.${pname}";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix
index ae52c41787b..ae52c41787b 100644
--- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix
diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome/update.nix
index 928eac45160..928eac45160 100644
--- a/pkgs/desktops/gnome-3/update.nix
+++ b/pkgs/desktops/gnome/update.nix
diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix
index 6ac9c3864ab..8c6df49fd12 100644
--- a/pkgs/desktops/mate/marco/default.nix
+++ b/pkgs/desktops/mate/marco/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop
-, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
+, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "marco";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libXpresent
     libstartup_notification
     gtk3
-    gnome3.zenity
+    gnome.zenity
     mate-settings-daemon
   ];
 
diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index 1046e431a3b..ccd20a6b875 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3
+{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3
 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook
 , mateUpdateScript }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3
     gtksourceview3
-    gnome3.gucharmap
+    gnome.gucharmap
     libwnck3
     libgtop
     libxml2
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index b1b59dc6402..62e0b5b3195 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-desktop";
diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix
index 3a99538d929..fd7b19e1de3 100644
--- a/pkgs/desktops/mate/mate-power-manager/default.nix
+++ b/pkgs/desktops/mate/mate-power-manager/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
+{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "mate-power-manager";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
      libxml2
      libcanberra-gtk3
      gtk3
-     gnome3.libgnome-keyring
+     gnome.libgnome-keyring
      libnotify
      dbus-glib
      upower
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 4c98c9cf520..5e226f4d886 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3
-, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }:
+, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }:
 
 stdenv.mkDerivation rec {
   pname = "pluma";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     python3
     gtksourceview3
     libpeas
-    gnome3.adwaita-icon-theme
+    gnome.adwaita-icon-theme
     mate.mate-desktop
   ];
 
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index e5182807b3f..0a5f3f09bfb 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, gnome3 }:
+{ config, pkgs, lib, gnome }:
 
 
 lib.makeScope pkgs.newScope (self: with self; {
@@ -25,7 +25,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   maintainers = with pkgs.lib.maintainers; [ worldofpeace ];
 
-  mutter = pkgs.gnome3.mutter334;
+  mutter = pkgs.gnome.mutter334;
 
   elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
 
@@ -72,17 +72,17 @@ lib.makeScope pkgs.newScope (self: with self; {
   elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
 
   elementary-session-settings = callPackage ./desktop/elementary-session-settings {
-    inherit (gnome3) gnome-session gnome-keyring;
+    inherit (gnome) gnome-session gnome-keyring;
   };
 
   elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
 
   extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts {
-    inherit (gnome3) file-roller gnome-bluetooth;
+    inherit (gnome) file-roller gnome-bluetooth;
   };
 
   gala = callPackage ./desktop/gala {
-    inherit (gnome3) gnome-desktop;
+    inherit (gnome) gnome-desktop;
   };
 
   wingpanel = callPackage ./desktop/wingpanel { };
@@ -109,7 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614
   # Take note of "I am holding off on "fixing" this bug for as long as possible."
   elementary-settings-daemon = callPackage ./services/elementary-settings-daemon {
-    inherit (gnome3) gnome-desktop;
+    inherit (gnome) gnome-desktop;
   };
 
   pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { };
@@ -169,7 +169,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { };
 
   switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell {
-    inherit (gnome3) gnome-desktop;
+    inherit (gnome) gnome-desktop;
   };
 
   switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { };
diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index a9a310ade82..43fd7a69e8a 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -6,7 +6,7 @@
 , meson
 , ninja
 , pkg-config
-, gnome3
+, gnome
 , perl
 , gettext
 , gtk3
@@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome3.updateScript {
+    updateScript = gnome.updateScript {
       packageName = repoName;
       attrPath = "pantheon.${pname}";
     };
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 1b7877cd79d..6ccd2a0c612 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -80,7 +80,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   xfce4-terminal = callPackage ./applications/xfce4-terminal { };
 
   xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter {
-    inherit (pkgs.gnome3) libsoup;
+    inherit (pkgs.gnome) libsoup;
   };
 
   xfdashboard = callPackage ./applications/xfdashboard {};
@@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library";
   xinitrc = xfce4-session.xinitrc;
   inherit (pkgs.gnome2) libglade;
-  inherit (pkgs.gnome3) vte gtksourceview;
+  inherit (pkgs.gnome) vte gtksourceview;
   xfce4-mixer-pulse = xfce4-mixer;
   thunar-bare = thunar.override {
     thunarPlugins = [];