From 8a39c749167c58f732e46fc29fe34cc66d4ef612 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:25:14 +0200 Subject: [PATCH 1/7] mask: use finalAttrs pattern --- pkgs/by-name/ma/mask/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index d1b1e0ff96ce..9cfff96a47e5 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -4,14 +4,14 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "mask"; version = "0.11.6"; src = fetchFromGitHub { owner = "jacobdeichert"; repo = "mask"; - rev = "mask/${version}"; + rev = "mask/${finalAttrs.version}"; hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; }; @@ -25,8 +25,8 @@ rustPlatform.buildRustPackage rec { description = "CLI task runner defined by a simple markdown file"; mainProgram = "mask"; homepage = "https://github.com/jacobdeichert/mask"; - changelog = "https://github.com/jacobdeichert/mask/blob/mask/${version}/CHANGELOG.md"; + changelog = "https://github.com/jacobdeichert/mask/blob/mask/${finalAttrs.version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; -} +}) From d8937c1e01550c9c69e84284411680a29ccb9da6 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:25:43 +0200 Subject: [PATCH 2/7] mask: use tag in fetchFromGitHub --- pkgs/by-name/ma/mask/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 9cfff96a47e5..667d1b0f611b 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "jacobdeichert"; repo = "mask"; - rev = "mask/${finalAttrs.version}"; + tag = "mask/${finalAttrs.version}"; hash = "sha256-xGD23pso5iS+9dmfTMNtR6YqUqKnzJTzMl+OnRGpL3g="; }; From c33d4c38078efcb8a5b6dc13b07d4c6016b9a33f Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:26:39 +0200 Subject: [PATCH 3/7] mask: remove `with lib;` --- pkgs/by-name/ma/mask/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 667d1b0f611b..5796ad5a9450 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -21,12 +21,12 @@ rustPlatform.buildRustPackage (finalAttrs: { # tests require mask to be installed doCheck = false; - meta = with lib; { + meta = { description = "CLI task runner defined by a simple markdown file"; mainProgram = "mask"; homepage = "https://github.com/jacobdeichert/mask"; changelog = "https://github.com/jacobdeichert/mask/blob/mask/${finalAttrs.version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; }; }) From a41ff318e16f6f4a777e79be3ea4061ed7b8824c Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:29:56 +0200 Subject: [PATCH 4/7] mask: add versionCheckHook --- pkgs/by-name/ma/mask/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 5796ad5a9450..249f9595e3de 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, rustPlatform, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -21,6 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { # tests require mask to be installed doCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "CLI task runner defined by a simple markdown file"; mainProgram = "mask"; From b28032e3b2c75d5cf998c25d77e5677210c5fdef Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:30:30 +0200 Subject: [PATCH 5/7] mask: add updateScript --- pkgs/by-name/ma/mask/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 249f9595e3de..39ddbc4af853 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, rustPlatform, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -26,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^mask/(.*)$" ]; }; + meta = { description = "CLI task runner defined by a simple markdown file"; mainProgram = "mask"; From 39a061a59785232b2a7b48b5c1612370afffd680 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:45:20 +0200 Subject: [PATCH 6/7] mask: enable tests --- pkgs/by-name/ma/mask/package.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index 39ddbc4af853..a33c9a0b76ec 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -1,9 +1,16 @@ { lib, + stdenv, fetchFromGitHub, rustPlatform, versionCheckHook, nix-update-script, + + # tests + nodejs, + python3, + php, + ruby, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -20,8 +27,16 @@ rustPlatform.buildRustPackage (finalAttrs: { useFetchCargoVendor = true; cargoHash = "sha256-JaYr6J3NOwVIHzGO4wLkke5O/T/9WUDENPgLP5Fwyhg="; - # tests require mask to be installed - doCheck = false; + preCheck = '' + export PATH=$PATH:$PWD/target/${stdenv.hostPlatform.rust.rustcTarget}/$cargoBuildType + ''; + + nativeCheckInputs = [ + nodejs + python3 + php + ruby + ]; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From bc2452370dc9c73372a2a1dc6d070cbf978c0b29 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 23 May 2025 00:24:15 +0200 Subject: [PATCH 7/7] mask: add defelo as maintainer --- pkgs/by-name/ma/mask/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix index a33c9a0b76ec..92b8d4602a5d 100644 --- a/pkgs/by-name/ma/mask/package.nix +++ b/pkgs/by-name/ma/mask/package.nix @@ -50,6 +50,9 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/jacobdeichert/mask"; changelog = "https://github.com/jacobdeichert/mask/blob/mask/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ + figsoda + defelo + ]; }; })