gnome-bluetooth{,_1_0}: Move to by-name

nixos/modules/services/x11/desktop-managers/gnome.nix

@@ -375,7 +375,7 @@ in
             pkgs.adwaita-icon-theme
             nixos-background-info
             pkgs.gnome-backgrounds
-            gnome-bluetooth
+            pkgs.gnome-bluetooth
             pkgs.gnome-color-manager
             gnome-control-center
             pkgs.gnome-shell-extensions

pkgs/applications/window-managers/phosh/default.nix

@@ -18,6 +18,7 @@
 , glib
 , gtk4
 , gnome
+, gnome-bluetooth
 , gnome-desktop
 , gcr
 , pam
@@ -71,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     networkmanager
     polkit
     gmobile
-    gnome.gnome-bluetooth
+    gnome-bluetooth
     gnome.gnome-control-center
     gnome-desktop
     gnome.gnome-session

pkgs/by-name/ag/ags/package.nix

@@ -8,7 +8,7 @@
   gobject-introspection,
   gjs,
   glib-networking,
-  gnome,
+  gnome-bluetooth,
   gtk-layer-shell,
   libpulseaudio,
   libsoup_3,
@@ -50,7 +50,7 @@ buildNpmPackage rec {
   buildInputs = [
     gjs
     glib-networking
-    gnome.gnome-bluetooth
+    gnome-bluetooth
     gtk-layer-shell
     libpulseaudio
     libsoup_3

pkgs/by-name/bu/budgie-control-center/package.nix

@@ -21,6 +21,7 @@
   glib-networking,
   glibc,
   gnome,
+  gnome-bluetooth_1_0,
   gnome-color-manager,
   gnome-desktop,
   gnome-remote-desktop,
@@ -116,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-desktop
     adwaita-icon-theme
     cheese
-    gnome.gnome-bluetooth_1_0
+    gnome-bluetooth_1_0
     gnome-remote-desktop
     gnome.gnome-settings-daemon
     gnome-user-share

pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix

@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-bluetooth";
-      attrPath = "gnome.gnome-bluetooth_1_0";
+      attrPath = "gnome-bluetooth_1_0";
       freeze = true;
     };
   };

pkgs/by-name/gn/gnome-bluetooth/package.nix

@@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-bluetooth";
-      attrPath = "gnome.gnome-bluetooth";
     };
   };
 

pkgs/desktops/gnome/default.nix

@@ -17,10 +17,6 @@ in
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { };
-
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
   gnome-session = callPackage ./core/gnome-session { };
@@ -109,6 +105,8 @@ in
   gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
   gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
   gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11.
+  gnome-bluetooth = lib.warn "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly." pkgs.gnome-bluetooth; # Added on 2024-08-28.
+  gnome-bluetooth_1_0 = lib.warn "The ‘gnome.gnome-bluetooth_1_0’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth_1_0’ directly." pkgs.gnome-bluetooth_1_0; # Added on 2024-08-28.
   gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11.
   gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11.
   gnome-chess = lib.warn "The ‘gnome.gnome-chess’ was moved to top-level. Please use ‘pkgs.gnome-chess’ directly." pkgs.gnome-chess; # Added on 2024-08-11.

pkgs/tools/bluetooth/blueberry/default.nix

@@ -2,7 +2,7 @@
 , lib
 , fetchFromGitHub
 , bluez-tools
-, gnome
+, gnome-bluetooth_1_0
 , gobject-introspection
 , libnotify
 , pavucontrol
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bluez-tools
-    gnome.gnome-bluetooth_1_0
+    gnome-bluetooth_1_0
     libnotify
     python3Packages.python
     util-linux

pkgs/top-level/all-packages.nix

@@ -36507,6 +36507,8 @@ with pkgs;
 
   gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
 
+  gnome-bluetooth_1_0 = callPackage ../by-name/gn/gnome-bluetooth/1.0 { };
+
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });