From 2bb2f5742a7dbebd5eef230ac512f87de493ccd2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Jun 2024 16:05:59 +0200
Subject: [PATCH] sushi: Move from gnome scope to top-level

---
 nixos/modules/services/desktops/gnome/sushi.nix               | 4 ++--
 nixos/modules/services/x11/desktop-managers/gnome.nix         | 2 +-
 .../core/sushi/default.nix => by-name/su/sushi/package.nix}   | 1 -
 pkgs/desktops/gnome/default.nix                               | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/gnome/core/sushi/default.nix => by-name/su/sushi/package.nix} (98%)

diff --git a/nixos/modules/services/desktops/gnome/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix
index 946030e4bb22..7f7360488eb4 100644
--- a/nixos/modules/services/desktops/gnome/sushi.nix
+++ b/nixos/modules/services/desktops/gnome/sushi.nix
@@ -31,9 +31,9 @@
 
   config = lib.mkIf config.services.gnome.sushi.enable {
 
-    environment.systemPackages = [ pkgs.gnome.sushi ];
+    environment.systemPackages = [ pkgs.sushi ];
 
-    services.dbus.packages = [ pkgs.gnome.sushi ];
+    services.dbus.packages = [ pkgs.sushi ];
 
   };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index ce962a21f2d2..7e7ed294c6f9 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -437,7 +437,7 @@ in
       programs.geary.enable = notExcluded pkgs.geary;
       programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility;
       programs.seahorse.enable = notExcluded pkgs.seahorse;
-      services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi;
+      services.gnome.sushi.enable = notExcluded pkgs.sushi;
 
       # VTE shell integration for gnome-console
       programs.bash.vteIntegration = mkDefault true;
diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/by-name/su/sushi/package.nix
similarity index 98%
rename from pkgs/desktops/gnome/core/sushi/default.nix
rename to pkgs/by-name/su/sushi/package.nix
index 8afdddc42828..aad4727da20b 100644
--- a/pkgs/desktops/gnome/core/sushi/default.nix
+++ b/pkgs/by-name/su/sushi/package.nix
@@ -72,7 +72,6 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "sushi";
-      attrPath = "gnome.sushi";
     };
   };
 
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 640e314b0b4b..4c7634d84888 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -100,8 +100,6 @@ in
 
   nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { };
 
-  sushi = callPackage ./core/sushi { };
-
   totem = callPackage ./core/totem { };
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
@@ -229,6 +227,7 @@ in
   rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22.
   seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22.
   simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22.
+  sushi = lib.warn "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly." pkgs.sushi; # Added on 2024-06-22.
   yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22.
   yelp-xsl = lib.warn "The ‘gnome.yelp-xsl’ was moved to top-level. Please use ‘pkgs.yelp-xsl’ directly." pkgs.yelp-xsl; # Added on 2024-06-22.
   zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22.