diff --git a/pkgs/servers/snac2/default.nix b/pkgs/by-name/sn/snac2/package.nix similarity index 53% rename from pkgs/servers/snac2/default.nix rename to pkgs/by-name/sn/snac2/package.nix index 7a12b94f9168..27921a048117 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -5,20 +5,19 @@ curl, openssl, nix-update-script, - testers, - snac2, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.73"; + version = "2.74"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; - repo = pname; - rev = version; - hash = "sha256-5LKDwp5f5BWhm+9uVBlv3mJpLLQ+ETP9lcRXlfD579Y="; + repo = "snac2"; + tag = finalAttrs.version; + hash = "sha256-jFII9MP+jmtguqE+QMQLbDQ6tSuhie0FhXeSyf42AaQ="; }; buildInputs = [ @@ -35,21 +34,21 @@ stdenv.mkDerivation rec { ] ); + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/snac"; + doInstallCheck = true; + passthru = { - tests.version = testers.testVersion { - package = snac2; - command = "${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; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34ef087548c4..bb13a9b4e526 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10431,8 +10431,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;