From 06c1ed782d9c3881ebb9b231fb929d9ce4746431 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 6 Nov 2024 15:47:06 +0100
Subject: [PATCH 1/4] gnome-firmware: format

---
 .../misc/gnome-firmware/default.nix           | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix
index 16749bc2292d..665d08cae386 100644
--- a/pkgs/applications/misc/gnome-firmware/default.nix
+++ b/pkgs/applications/misc/gnome-firmware/default.nix
@@ -1,21 +1,22 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, appstream-glib
-, desktop-file-utils
-, fwupd
-, gettext
-, glib
-, gtk4
-, libadwaita
-, libxmlb
-, meson
-, ninja
-, pkg-config
-, systemd
-, help2man
-, wrapGAppsHook4
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  appstream-glib,
+  desktop-file-utils,
+  fwupd,
+  gettext,
+  glib,
+  gtk4,
+  libadwaita,
+  libxmlb,
+  meson,
+  ninja,
+  pkg-config,
+  systemd,
+  help2man,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {

From e7e4f76aebab757d3088071c0aceac2df78a45bb Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 6 Nov 2024 15:48:54 +0100
Subject: [PATCH 2/4] gnome-firmware: move to by-name

---
 .../default.nix => by-name/gn/gnome-firmware/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/gnome-firmware/default.nix => by-name/gn/gnome-firmware/package.nix} (100%)

diff --git a/pkgs/applications/misc/gnome-firmware/default.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
similarity index 100%
rename from pkgs/applications/misc/gnome-firmware/default.nix
rename to pkgs/by-name/gn/gnome-firmware/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdf056feef01..e194cd92234f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17463,8 +17463,6 @@ with pkgs;
 
   gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { };
 
-  gnome-firmware = callPackage ../applications/misc/gnome-firmware { };
-
   gnome-tecla = callPackage ../applications/misc/gnome-tecla { };
 
   gnome-usage = callPackage ../applications/misc/gnome-usage { };

From f9337922ac2c84ad509dd392c56f358141071c3f Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 6 Nov 2024 15:51:06 +0100
Subject: [PATCH 3/4] gnome-firmware: switch to finalAttrs

---
 pkgs/by-name/gn/gnome-firmware/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
index 665d08cae386..453903fe19eb 100644
--- a/pkgs/by-name/gn/gnome-firmware/package.nix
+++ b/pkgs/by-name/gn/gnome-firmware/package.nix
@@ -19,7 +19,7 @@
   wrapGAppsHook4,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-firmware";
   version = "46.0";
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "gnome-firmware";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-tEMSlKsqqPMZA0Gr89+u3dmAmZ7ffQm/2i1AB93y05E=";
   };
 
@@ -67,4 +67,4 @@ stdenv.mkDerivation rec {
     maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
-}
+})

From 6bc77c1aaddef5960f946ed6faeba7ac8b71276a Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 6 Nov 2024 15:52:13 +0100
Subject: [PATCH 4/4] gnome-firmware: 46.0 -> 47.0

---
 pkgs/by-name/gn/gnome-firmware/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
index 453903fe19eb..dc736a30ef2e 100644
--- a/pkgs/by-name/gn/gnome-firmware/package.nix
+++ b/pkgs/by-name/gn/gnome-firmware/package.nix
@@ -21,14 +21,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-firmware";
-  version = "46.0";
+  version = "47.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "gnome-firmware";
     rev = finalAttrs.version;
-    sha256 = "sha256-tEMSlKsqqPMZA0Gr89+u3dmAmZ7ffQm/2i1AB93y05E=";
+    sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ=";
   };
 
   nativeBuildInputs = [