From b03f1ceff6ca1eff154f79134b123bc4315f772c Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 May 2023 22:02:20 -0400 Subject: [PATCH 1/2] mermerd: fix version command --- .../tools/database/mermerd/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 6df4922f043d..9b71835e700c 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -1,6 +1,6 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { @@ -16,15 +16,21 @@ buildGoModule rec { vendorHash = "sha256-RSCpkQymvUvY2bOkjhsyKnDa3vezUjC33Nwv0+O4OOQ="; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + ]; + # the tests expect a database to be running doCheck = false; meta = with lib; { description = "Create Mermaid-Js ERD diagrams from existing tables"; homepage = "https://github.com/KarnerTh/mermerd"; - license = licenses.mit; - maintainers = with lib.maintainers; [ austin-artificial ]; changelog = "https://github.com/KarnerTh/mermerd/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ austin-artificial ]; }; - } From d4e3be78de1daded6ba524a211ef3644f4faaf92 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 15 May 2023 22:04:03 -0400 Subject: [PATCH 2/2] mermerd: add version test --- pkgs/development/tools/database/mermerd/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/tools/database/mermerd/default.nix b/pkgs/development/tools/database/mermerd/default.nix index 9b71835e700c..2240c23433af 100644 --- a/pkgs/development/tools/database/mermerd/default.nix +++ b/pkgs/development/tools/database/mermerd/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, mermerd }: buildGoModule rec { @@ -26,6 +28,13 @@ buildGoModule rec { # the tests expect a database to be running doCheck = false; + passthru.tests = { + version = testers.testVersion { + package = mermerd; + command = "mermerd version"; + }; + }; + meta = with lib; { description = "Create Mermaid-Js ERD diagrams from existing tables"; homepage = "https://github.com/KarnerTh/mermerd";