From 572d0e4403c3b4c091d19cd4325cd2b15220857b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 11 Aug 2024 18:33:51 +0200
Subject: [PATCH] gnome-contacts: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix        | 2 +-
 .../default.nix => by-name/gn/gnome-contacts/package.nix}    | 5 +----
 pkgs/desktops/gnome/default.nix                              | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{desktops/gnome/core/gnome-contacts/default.nix => by-name/gn/gnome-contacts/package.nix} (91%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index a41997b2fc5a..63d33d306009 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -406,7 +406,7 @@ in
             pkgs.gnome-characters
             pkgs.gnome-clocks
             pkgs.gnome-console
-            gnome-contacts
+            pkgs.gnome-contacts
             pkgs.gnome-font-viewer
             pkgs.gnome-logs
             pkgs.gnome-maps
diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/by-name/gn/gnome-contacts/package.nix
similarity index 91%
rename from pkgs/desktops/gnome/core/gnome-contacts/default.nix
rename to pkgs/by-name/gn/gnome-contacts/package.nix
index b06350742473..8adb73248323 100644
--- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix
+++ b/pkgs/by-name/gn/gnome-contacts/package.nix
@@ -63,10 +63,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-contacts";
-      attrPath = "gnome.gnome-contacts";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-contacts"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 22a20af9094c..57ef762df9ea 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -32,8 +32,6 @@ in
 
   gnome-color-manager = callPackage ./core/gnome-color-manager { };
 
-  gnome-contacts = callPackage ./core/gnome-contacts { };
-
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
   gnome-initial-setup = callPackage ./core/gnome-initial-setup { };
@@ -170,6 +168,7 @@ in
   gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22.
   gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22.
   gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22.
+  gnome-contacts = lib.warn "The ‘gnome.gnome-contacts’ was moved to top-level. Please use ‘pkgs.gnome-contacts’ directly." pkgs.gnome-contacts; # Added on 2024-08-11.
   gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
   gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
   gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.