From 8e4670486ad326c0e64493dbb7467cdd29a622f7 Mon Sep 17 00:00:00 2001
From: Ruby Iris Juric <ruby@srxl.me>
Date: Tue, 5 Aug 2025 21:40:49 +1000
Subject: [PATCH 1/2] sharkey: 2025.4.3 -> 2025.4.4

---
 pkgs/by-name/sh/sharkey/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix
index 288e295a2f4a..42d1aca219ee 100644
--- a/pkgs/by-name/sh/sharkey/package.nix
+++ b/pkgs/by-name/sh/sharkey/package.nix
@@ -21,21 +21,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sharkey";
-  version = "2025.4.3";
+  version = "2025.4.4";
 
   src = fetchFromGitLab {
     domain = "activitypub.software";
     owner = "TransFem-org";
     repo = "Sharkey";
     tag = finalAttrs.version;
-    hash = "sha256-B268bSR5VFyJ/TaWg3xxpnP4oRj07XUpikJZ2Tb9FEY=";
+    hash = "sha256-h6FkjwJ+TI5NZmGYOl/+yNP7gyc7FKmpdkfXmgqxh/s=";
     fetchSubmodules = true;
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-S8LxawbtguFOEZyYbS1FQWw/TcRm4Z6mG7dUhfXbf1c=";
+    fetcherVersion = 2;
+    hash = "sha256-34X8oJGkGXB9y7W4MquUkv8vY5yq2RoGIUCbjYppkIU=";
   };
 
   nativeBuildInputs = [

From 64a200b22ab02d5b5af00f255f34c6523fcb3824 Mon Sep 17 00:00:00 2001
From: Ruby Iris Juric <ruby@srxl.me>
Date: Mon, 25 Aug 2025 20:14:15 +1000
Subject: [PATCH 2/2] sharkey: add tmarkus as maintainer

https://github.com/NixOS/nixpkgs/pull/431142#pullrequestreview-3149369365
---
 nixos/modules/services/web-apps/sharkey.nix | 5 ++++-
 nixos/tests/web-apps/sharkey.nix            | 5 ++++-
 pkgs/by-name/sh/sharkey/package.nix         | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/sharkey.nix b/nixos/modules/services/web-apps/sharkey.nix
index 3ff9a37784c3..9bf363279f08 100644
--- a/nixos/modules/services/web-apps/sharkey.nix
+++ b/nixos/modules/services/web-apps/sharkey.nix
@@ -296,5 +296,8 @@ in
       })
     ]);
 
-  meta.maintainers = with lib.maintainers; [ srxl ];
+  meta.maintainers = with lib.maintainers; [
+    srxl
+    tmarkus
+  ];
 }
diff --git a/nixos/tests/web-apps/sharkey.nix b/nixos/tests/web-apps/sharkey.nix
index f3261e612100..3a07493178b5 100644
--- a/nixos/tests/web-apps/sharkey.nix
+++ b/nixos/tests/web-apps/sharkey.nix
@@ -49,5 +49,8 @@ in
           machine.succeed("curl --fail http://localhost:3000")
     '';
 
-  meta.maintainers = with lib.maintainers; [ srxl ];
+  meta.maintainers = with lib.maintainers; [
+    srxl
+    tmarkus
+  ];
 }
diff --git a/pkgs/by-name/sh/sharkey/package.nix b/pkgs/by-name/sh/sharkey/package.nix
index 42d1aca219ee..33b3087d9d08 100644
--- a/pkgs/by-name/sh/sharkey/package.nix
+++ b/pkgs/by-name/sh/sharkey/package.nix
@@ -161,6 +161,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.agpl3Only;
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "sharkey";
-    maintainers = with lib.maintainers; [ srxl ];
+    maintainers = with lib.maintainers; [
+      srxl
+      tmarkus
+    ];
   };
 })