From 282814f232a66aa08f3147ea5b59a6455f915389 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 2 Apr 2025 00:22:17 -0400
Subject: [PATCH 1/3] metadata-cleaner: modernize

---
 pkgs/by-name/me/metadata-cleaner/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
index 1f42f6b474f3..720aa512b9d4 100644
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@@ -21,13 +21,12 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "metadata-cleaner";
   version = "2.5.6";
-
-  format = "other";
+  pyproject = false;
 
   src = fetchFromGitLab {
     owner = "rmnvgr";
     repo = "metadata-cleaner";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs=";
   };
 
@@ -61,15 +60,15 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Python GTK application to view and clean metadata in files, using mat2";
     mainProgram = "metadata-cleaner";
     homepage = "https://gitlab.com/rmnvgr/metadata-cleaner";
-    changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
+    changelog = "https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v${version}/CHANGELOG.md";
+    license = with lib.licenses; [
       gpl3Plus
       cc-by-sa-40
     ];
-    maintainers = with maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members;
+    maintainers = with lib.maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members;
   };
 }

From c68fe32804fcc4f0f5ed5b2d43c19a5dcdf02289 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 2 Apr 2025 00:22:39 -0400
Subject: [PATCH 2/3] metadata-cleaner: remove gnome circle team from
 maintainers

https://gitlab.gnome.org/Teams/Circle/-/commit/a6c5c84990a41d0ba6105a4de94381af0ac3bc72
---
 pkgs/by-name/me/metadata-cleaner/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/metadata-cleaner/package.nix b/pkgs/by-name/me/metadata-cleaner/package.nix
index 720aa512b9d4..686ec13faded 100644
--- a/pkgs/by-name/me/metadata-cleaner/package.nix
+++ b/pkgs/by-name/me/metadata-cleaner/package.nix
@@ -69,6 +69,6 @@ python3.pkgs.buildPythonApplication rec {
       gpl3Plus
       cc-by-sa-40
     ];
-    maintainers = with lib.maintainers; [ dotlambda ] ++ lib.teams.gnome-circle.members;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 57f72d3f7898810445fb5d94daca4a62b2b0627c Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Wed, 2 Apr 2025 00:23:41 -0400
Subject: [PATCH 3/3] keypunch: add gnome circle team to maintainers

https://gitlab.gnome.org/Teams/Circle/-/commit/820f48ff4f8fb649cdecc25af24f5624be0d21f9
---
 pkgs/by-name/ke/keypunch/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix
index f87e343aa4e4..a386ee380ecb 100644
--- a/pkgs/by-name/ke/keypunch/package.nix
+++ b/pkgs/by-name/ke/keypunch/package.nix
@@ -63,10 +63,13 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/bragefuglseth/keypunch";
     license = lib.licenses.gpl3Plus;
     mainProgram = "keypunch";
-    maintainers = with lib.maintainers; [
-      tomasajt
-      getchoo
-    ];
+    maintainers =
+      with lib.maintainers;
+      [
+        tomasajt
+        getchoo
+      ]
+      ++ lib.teams.gnome-circle.members;
     platforms = lib.platforms.linux;
   };
 })