From fedc161645a93a75219fadc81705e875dbf08824 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Jun 2024 13:55:51 +0200
Subject: [PATCH] simple-scan: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix          | 2 +-
 .../default.nix => by-name/si/simple-scan/package.nix}         | 0
 pkgs/desktops/gnome/default.nix                                | 3 +--
 pkgs/top-level/all-packages.nix                                | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/gnome/core/simple-scan/default.nix => by-name/si/simple-scan/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index e9ae8692adbf..694160702e23 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -417,7 +417,7 @@ in
             pkgs.loupe
             pkgs.nautilus
             pkgs.gnome-connections
-            simple-scan
+            pkgs.simple-scan
             pkgs.snapshot
             totem
             yelp
diff --git a/pkgs/desktops/gnome/core/simple-scan/default.nix b/pkgs/by-name/si/simple-scan/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/simple-scan/default.nix
rename to pkgs/by-name/si/simple-scan/package.nix
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 886442d5fabc..eaa7640be846 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -116,8 +116,6 @@ in
 
   rygel = callPackage ./core/rygel { };
 
-  simple-scan = callPackage ./core/simple-scan { };
-
   sushi = callPackage ./core/sushi { };
 
   totem = callPackage ./core/totem { };
@@ -251,6 +249,7 @@ in
   nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.
   nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.
   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.
 
 #### Removals
   anjuta = throw "`anjuta` was removed after not being maintained upstream and losing control of its official domain."; # 2024-01-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0e2bd66cb55..c6ffb5b256e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34050,8 +34050,6 @@ with pkgs;
 
   sic-image-cli = callPackage ../tools/graphics/sic-image-cli { };
 
-  simple-scan = gnome.simple-scan;
-
   sioyek = libsForQt5.callPackage ../applications/misc/sioyek { };
 
   siproxd = callPackage ../applications/networking/siproxd { };