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

---
 nixos/modules/services/x11/desktop-managers/gnome.nix        | 3 +--
 .../gnome/core => by-name/gn}/gnome-software/fix-paths.patch | 0
 .../default.nix => by-name/gn/gnome-software/package.nix}    | 5 +----
 pkgs/desktops/gnome/default.nix                              | 3 +--
 4 files changed, 3 insertions(+), 8 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-software/fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-software/default.nix => by-name/gn/gnome-software/package.nix} (94%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 9b17226a5bf1..cf54adc1a24c 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -395,7 +395,6 @@ in
     # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst
     (lib.mkIf serviceCfg.core-utilities.enable {
       environment.systemPackages =
-        with pkgs.gnome;
         utils.removePackagesByName
           ([
             pkgs.baobab
@@ -423,7 +422,7 @@ in
           ] ++ lib.optionals config.services.flatpak.enable [
             # Since PackageKit Nix support is not there yet,
             # only install gnome-software if flatpak is enabled.
-            gnome-software
+            pkgs.gnome-software
           ])
           config.environment.gnome.excludePackages;
 
diff --git a/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch b/pkgs/by-name/gn/gnome-software/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-software/fix-paths.patch
rename to pkgs/by-name/gn/gnome-software/fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/by-name/gn/gnome-software/package.nix
similarity index 94%
rename from pkgs/desktops/gnome/core/gnome-software/default.nix
rename to pkgs/by-name/gn/gnome-software/package.nix
index c7d2dc271f7a..8636bb0d3b36 100644
--- a/pkgs/desktops/gnome/core/gnome-software/default.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -108,10 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ];
 
   passthru = {
-    updateScript = gnome.updateScript {
-      packageName = "gnome-software";
-      attrPath = "gnome.gnome-software";
-    };
+    updateScript = gnome.updateScript { packageName = "gnome-software"; };
   };
 
   meta = with lib; {
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6a4827fae437..fdbd7b8e796f 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -47,8 +47,6 @@ in
   # Using 43 to match Mutter used in Pantheon
   gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { };
 
-  gnome-software = callPackage ./core/gnome-software { };
-
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   mutter = callPackage ./core/mutter { };
@@ -179,6 +177,7 @@ in
   gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
   gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11.
   gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
+  gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
   gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
   gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22.
   gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13.