From 7a3aad75d3607cfc6162a04109effdc50994d0b0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 13 Jun 2024 11:15:49 +0200
Subject: [PATCH] gnome-autoar: Move from gnome scope to top-level

---
 .../default.nix => by-name/gn/gnome-autoar/package.nix}       | 1 -
 pkgs/desktops/gnome/default.nix                               | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{desktops/gnome/misc/gnome-autoar/default.nix => by-name/gn/gnome-autoar/package.nix} (96%)

diff --git a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix b/pkgs/by-name/gn/gnome-autoar/package.nix
similarity index 96%
rename from pkgs/desktops/gnome/misc/gnome-autoar/default.nix
rename to pkgs/by-name/gn/gnome-autoar/package.nix
index 8d1adac088e8..dfbcc24898b5 100644
--- a/pkgs/desktops/gnome/misc/gnome-autoar/default.nix
+++ b/pkgs/by-name/gn/gnome-autoar/package.nix
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-autoar";
-      attrPath = "gnome.gnome-autoar";
     };
   };
 
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index e0aedd09f4d9..7d2cb9d41fc6 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -251,8 +251,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   pomodoro = callPackage ./misc/pomodoro { };
 
-  gnome-autoar = callPackage ./misc/gnome-autoar { };
-
   gnome-packagekit = callPackage ./misc/gnome-packagekit { };
 }) // lib.optionalAttrs config.allowAliases {
 #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
@@ -261,6 +259,8 @@ lib.makeScope pkgs.newScope (self: with self; {
   gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27
   gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27
 
+  gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
+
 #### 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 6019a3aa0412..59cfab6c13ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31201,9 +31201,7 @@ with pkgs;
 
   gnomecast = callPackage ../applications/video/gnomecast { };
 
-  gnome-recipes = callPackage ../applications/misc/gnome-recipes {
-    inherit (gnome) gnome-autoar;
-  };
+  gnome-recipes = callPackage ../applications/misc/gnome-recipes { };
 
   gollum = callPackage ../applications/misc/gollum { };