From e5fe7999879627f170efcb97df2cedb67402f88c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 14 Apr 2022 18:51:25 +0800
Subject: [PATCH] gnome-firmware: rename from gnome-firmware-updater

---
 .../default.nix                                      | 12 ++++++------
 pkgs/top-level/aliases.nix                           |  1 +
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/applications/misc/{gnome-firmware-updater => gnome-firmware}/default.nix (73%)

diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware/default.nix
similarity index 73%
rename from pkgs/applications/misc/gnome-firmware-updater/default.nix
rename to pkgs/applications/misc/gnome-firmware/default.nix
index 30d3b57003d1..d8b88031501f 100644
--- a/pkgs/applications/misc/gnome-firmware-updater/default.nix
+++ b/pkgs/applications/misc/gnome-firmware/default.nix
@@ -18,13 +18,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "gnome-firmware-updater";
+  pname = "gnome-firmware";
   version = "3.34.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
-    owner = "hughsie";
-    repo = "gnome-firmware-updater";
+    owner = "World";
+    repo = "gnome-firmware";
     rev = version;
     sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l";
   };
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
   patches = [
     # Fixes manual build
     (fetchpatch {
-      url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
+      url = "https://gitlab.gnome.org/World/gnome-firmware/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch";
       sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06";
     })
     (fetchpatch {
-      url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
+      url = "https://gitlab.gnome.org/World/gnome-firmware/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch";
       sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1";
     })
   ];
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater";
+    homepage = "https://gitlab.gnome.org/World/gnome-firmware";
     description = "Tool for installing firmware on devices";
     license = licenses.gpl2Plus;
     maintainers = teams.gnome.members;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 897005fecaeb..da0f7c6e52c4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -446,6 +446,7 @@ mapAliases ({
   gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07
   gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08
   gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06
+  gnome-firmware-updater = gnome-firmware; # added 2022-04-14
   gnome-passwordsafe = gnome-secrets; # added 2022-01-30
   gnome-mpv = celluloid; # Added 2019-08-22
   gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # Added 2022-01-15
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c0d13a19acc4..c8c15382cdc0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15126,7 +15126,7 @@ with pkgs;
 
   gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing {};
 
-  gnome-firmware-updater = callPackage ../applications/misc/gnome-firmware-updater {};
+  gnome-firmware = callPackage ../applications/misc/gnome-firmware {};
 
   gnome-usage = callPackage ../applications/misc/gnome-usage {};