From c7814ab4d0d254c091f336f50bf9cc448cf34e15 Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 31 Dec 2024 22:12:28 -0300 Subject: [PATCH 1/2] xc: tweak, add update script, add sanity tests Signed-off-by: lucasew --- pkgs/by-name/xc/xc/example.md | 9 +++++++++ pkgs/by-name/xc/xc/package.nix | 25 ++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/xc/xc/example.md diff --git a/pkgs/by-name/xc/xc/example.md b/pkgs/by-name/xc/xc/example.md new file mode 100644 index 000000000000..1d7bf507bd85 --- /dev/null +++ b/pkgs/by-name/xc/xc/example.md @@ -0,0 +1,9 @@ +# Tasks + +## example + +Tests if xc works + +```sh +touch ./test +``` diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix index 95ee1c8f1e3a..924dbf49bff5 100644 --- a/pkgs/by-name/xc/xc/package.nix +++ b/pkgs/by-name/xc/xc/package.nix @@ -2,6 +2,8 @@ lib, buildGoModule, fetchFromGitHub, + gitUpdater, + versionCheckHook, }: buildGoModule rec { @@ -11,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "joerdav"; repo = pname; - rev = "v${version}"; + tag = "v${version}"; sha256 = "sha256-vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU="; }; @@ -23,13 +25,26 @@ buildGoModule rec { "-X=main.version=${version}" ]; - meta = with lib; { + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + postInstallCheck = '' + cp ${./example.md} example.md + $out/bin/xc -file ./example.md example + if ! [[ -f test ]] then + echo "example.md didn't do anything" >&2 + return 1 + fi + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { description = "Markdown defined task runner"; mainProgram = "xc"; homepage = "https://xcfile.dev/"; - changelog = "https://github.com/joerdav/xc/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/joerdav/xc/releases/tag/${src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda joerdav ]; From 530628753825a4188d9ca92bec712cad4bdc13da Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 31 Dec 2024 22:13:47 -0300 Subject: [PATCH 2/2] xc: 0.8.0 -> 0.8.5 Signed-off-by: lucasew --- pkgs/by-name/xc/xc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix index 924dbf49bff5..e369418dc05f 100644 --- a/pkgs/by-name/xc/xc/package.nix +++ b/pkgs/by-name/xc/xc/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "xc"; - version = "0.8.0"; + version = "0.8.5"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; tag = "v${version}"; - sha256 = "sha256-vTyCS85xbJnAgbasWD6LFxij9EezzlJ1pyvCJptqmOU="; + sha256 = "sha256-eaFHK7VsfLSgSJehv4urxq8qMPT+zzs2tRypz4q+MLc="; }; vendorHash = "sha256-EbIuktQ2rExa2DawyCamTrKRC1yXXMleRB8/pcKFY5c=";