From 24f2cf4b4f1d975c23b9f9cdc967216b90fedb33 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 22 Jun 2024 15:04:22 +0200
Subject: [PATCH] yelp: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix          | 2 +-
 .../core/yelp/default.nix => by-name/ye/yelp/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/yelp/default.nix => by-name/ye/yelp/package.nix} (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 1ff6ebb1a755..5e9f1114137f 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -420,7 +420,7 @@ in
             pkgs.simple-scan
             pkgs.snapshot
             totem
-            yelp
+            pkgs.yelp
           ] ++ lib.optionals config.services.flatpak.enable [
             # Since PackageKit Nix support is not there yet,
             # only install gnome-software if flatpak is enabled.
diff --git a/pkgs/desktops/gnome/core/yelp/default.nix b/pkgs/by-name/ye/yelp/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/yelp/default.nix
rename to pkgs/by-name/ye/yelp/package.nix
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 2ad252161f65..bdf4cae1d193 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -108,8 +108,6 @@ in
 
   totem = callPackage ./core/totem { };
 
-  yelp = callPackage ./core/yelp { };
-
   yelp-xsl = callPackage ./core/yelp-xsl { };
 
 #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
@@ -239,6 +237,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.
+  yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # 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.
 
 #### Removals
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1f41c5e9c5..f6129c0e2df5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35557,8 +35557,6 @@ with pkgs;
 
   yeetgif = callPackage ../applications/graphics/yeetgif { };
 
-  inherit (gnome) yelp;
-
   yelp-tools = callPackage ../development/misc/yelp-tools { };
 
   yewtube = callPackage ../applications/misc/yewtube { };