From a7d82e802363df539cb7fdd9fe1df7f902eb6aa2 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 25 Jun 2024 20:51:44 -0400
Subject: [PATCH 1/5] identity: migrate to by-name

---
 pkgs/{applications/graphics => by-name/id}/identity/Cargo.lock  | 0
 .../identity/default.nix => by-name/id/identity/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/graphics => by-name/id}/identity/Cargo.lock (100%)
 rename pkgs/{applications/graphics/identity/default.nix => by-name/id/identity/package.nix} (100%)

diff --git a/pkgs/applications/graphics/identity/Cargo.lock b/pkgs/by-name/id/identity/Cargo.lock
similarity index 100%
rename from pkgs/applications/graphics/identity/Cargo.lock
rename to pkgs/by-name/id/identity/Cargo.lock
diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/by-name/id/identity/package.nix
similarity index 100%
rename from pkgs/applications/graphics/identity/default.nix
rename to pkgs/by-name/id/identity/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b24e0955a7c5..4a34337939db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31646,8 +31646,6 @@ with pkgs;
 
   id3v2 = callPackage ../applications/audio/id3v2 { };
 
-  identity = callPackage ../applications/graphics/identity { };
-
   ifenslave = callPackage ../os-specific/linux/ifenslave { };
 
   ii = callPackage ../applications/networking/irc/ii {

From cc4f9ca3a1e626833b4093808b9d6429af922bcf Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 25 Jun 2024 20:52:02 -0400
Subject: [PATCH 2/5] identity: format with nixfmt

---
 pkgs/by-name/id/identity/package.nix | 39 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index debc7e2f423b..033eb5496cc1 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -1,24 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, rustPlatform
-, nix-update-script
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  rustPlatform,
+  nix-update-script,
 
-, appstream
-, blueprint-compiler
-, cargo
-, desktop-file-utils
-, meson
-, ninja
-, pkg-config
-, rustc
-, wrapGAppsHook4
+  appstream,
+  blueprint-compiler,
+  cargo,
+  desktop-file-utils,
+  meson,
+  ninja,
+  pkg-config,
+  rustc,
+  wrapGAppsHook4,
 
-, dav1d
-, gst_all_1
-, gtk4
-, libadwaita
-, libwebp
+  dav1d,
+  gst_all_1,
+  gtk4,
+  libadwaita,
+  libwebp,
 }:
 
 stdenv.mkDerivation rec {

From dee472c6e5864792464d7f7d51d59c73956f1416 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 25 Jun 2024 20:52:53 -0400
Subject: [PATCH 3/5] identity: adopt

---
 pkgs/by-name/id/identity/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index 033eb5496cc1..bbae67e2a50a 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.gnome.org/YaLTeR/identity";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ getchoo ];
   };
 }

From 5c06a476139cf47f465303c56a427735322c3953 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 25 Jun 2024 20:54:16 -0400
Subject: [PATCH 4/5] identity: don't overuse `with lib;`

https://github.com/NixOS/nixpkgs/issues/208242
---
 pkgs/by-name/id/identity/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index bbae67e2a50a..d76b6da6a11b 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -68,12 +68,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Program for comparing multiple versions of an image or video";
-    mainProgram = "identity";
     homepage = "https://gitlab.gnome.org/YaLTeR/identity";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ getchoo ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "identity";
+    platforms = lib.platforms.linux;
   };
 }

From 5fbc32975cabd096820b37b0c46a7f10e6969f27 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Tue, 25 Jun 2024 20:55:47 -0400
Subject: [PATCH 5/5] identity: reorganize arguments

---
 pkgs/by-name/id/identity/package.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix
index d76b6da6a11b..55731e045e10 100644
--- a/pkgs/by-name/id/identity/package.nix
+++ b/pkgs/by-name/id/identity/package.nix
@@ -3,23 +3,21 @@
   stdenv,
   fetchFromGitLab,
   rustPlatform,
-  nix-update-script,
-
+  cargo,
+  rustc,
   appstream,
   blueprint-compiler,
-  cargo,
-  desktop-file-utils,
-  meson,
-  ninja,
-  pkg-config,
-  rustc,
-  wrapGAppsHook4,
-
   dav1d,
+  desktop-file-utils,
   gst_all_1,
   gtk4,
   libadwaita,
   libwebp,
+  meson,
+  ninja,
+  pkg-config,
+  nix-update-script,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {