From 5957a5f245c0069b901a5b9abac6cbde0e8f216c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 21 Mar 2025 08:55:21 +0100
Subject: [PATCH 1/4] snac2: move to `pkgs/by-name`

---
 .../{servers/snac2/default.nix => by-name/sn/snac2/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/snac2/default.nix => by-name/sn/snac2/package.nix} (100%)

diff --git a/pkgs/servers/snac2/default.nix b/pkgs/by-name/sn/snac2/package.nix
similarity index 100%
rename from pkgs/servers/snac2/default.nix
rename to pkgs/by-name/sn/snac2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c0963d06bed..2daf3aab23c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10437,8 +10437,6 @@ with pkgs;
     scheme = guile;
   };
 
-  snac2 = darwin.apple_sdk_11_0.callPackage ../servers/snac2 { };
-
   soapyairspy = callPackage ../applications/radio/soapyairspy {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) IOKit Security;

From 05b0fea69af35eddf0d73e068c196c335fd3e010 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 21 Mar 2025 09:06:14 +0100
Subject: [PATCH 2/4] snac2: switch to `finalAttrs`

---
 pkgs/by-name/sn/snac2/package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 7a12b94f9168..35c5559353e4 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -9,15 +9,15 @@
   snac2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
   version = "2.73";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
-    repo = pname;
-    rev = version;
+    repo = "snac2";
+    tag = finalAttrs.version;
     hash = "sha256-5LKDwp5f5BWhm+9uVBlv3mJpLLQ+ETP9lcRXlfD579Y=";
   };
 
@@ -38,18 +38,18 @@ stdenv.mkDerivation rec {
   passthru = {
     tests.version = testers.testVersion {
       package = snac2;
-      command = "${meta.mainProgram} || true";
+      command = "${finalAttrs.meta.mainProgram} || true";
     };
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
-    homepage = "https://codeberg.org/grunfink/snac2";
+  meta = {
+    changelog = "https://codeberg.org/grunfink/snac2/src/tag/${finalAttrs.version}/RELEASE_NOTES.md";
     description = "Simple, minimalistic ActivityPub instance (2.x, C)";
-    changelog = "https://codeberg.org/grunfink/snac2/src/tag/${version}/RELEASE_NOTES.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ misuzu ];
-    platforms = platforms.unix;
+    homepage = "https://codeberg.org/grunfink/snac2";
+    license = lib.licenses.mit;
     mainProgram = "snac";
+    maintainers = with lib.maintainers; [ misuzu ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From b342cbe2cad329a8923e161dceb7f54db83332f6 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 21 Mar 2025 09:07:57 +0100
Subject: [PATCH 3/4] snac2: use `versionCheckHook`

---
 pkgs/by-name/sn/snac2/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 35c5559353e4..7bb4dc435519 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -5,8 +5,7 @@
   curl,
   openssl,
   nix-update-script,
-  testers,
-  snac2,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -35,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/snac";
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion {
-      package = snac2;
-      command = "${finalAttrs.meta.mainProgram} || true";
-    };
     updateScript = nix-update-script { };
   };
 

From 8c3e22fa403efd282da6ffbfad1b0db26cedb590 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 21 Mar 2025 09:17:22 +0100
Subject: [PATCH 4/4] snac2: 2.73 -> 2.74

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

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 7bb4dc435519..27921a048117 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.73";
+  version = "2.74";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-5LKDwp5f5BWhm+9uVBlv3mJpLLQ+ETP9lcRXlfD579Y=";
+    hash = "sha256-jFII9MP+jmtguqE+QMQLbDQ6tSuhie0FhXeSyf42AaQ=";
   };
 
   buildInputs = [