From 652c4994d4b68d4bc0348fab96d9064dbc9b8fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 19 Jun 2023 10:43:10 +0200 Subject: [PATCH] tang: 13 -> 14 Add updater and basic version test --- pkgs/servers/tang/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 1a66d8f28de9..227daa2cfb9f 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -9,17 +9,21 @@ , systemd , meson , ninja +, makeWrapper +, testers +, tang +, gitUpdater }: stdenv.mkDerivation rec { pname = "tang"; - version = "13"; + version = "14"; src = fetchFromGitHub { owner = "latchset"; repo = "tang"; rev = "refs/tags/v${version}"; - hash = "sha256-SOdgMUWavTaDUiVvpEyE9ac+9aDmZs74n7ObugksBcc="; + hash = "sha256-QKURKb2g71pZvuZlJk3Rc26H3oU0WSkjgQtJQLrYGbw="; }; nativeBuildInputs = [ @@ -27,6 +31,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config + makeWrapper ]; buildInputs = [ @@ -41,6 +46,21 @@ stdenv.mkDerivation rec { "man" ]; + postFixup = '' + wrapProgram $out/bin/tang-show-keys --prefix PATH ":" ${lib.makeBinPath [ jose ]} + wrapProgram $out/libexec/tangd-keygen --prefix PATH ":" ${lib.makeBinPath [ jose ]} + wrapProgram $out/libexec/tangd-rotate-keys --prefix PATH ":" ${lib.makeBinPath [ jose ]} + ''; + + passthru = { + tests.version = testers.testVersion { + package = tang; + command = "${tang}/libexec/tangd --version"; + version = "tangd ${version}"; + }; + updateScript = gitUpdater { }; + }; + meta = { description = "Server for binding data to network presence"; homepage = "https://github.com/latchset/tang";