From 4fe988e750e88ede4e0f1a3c9fa41afc1a54a80b Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 7 Oct 2024 23:09:26 +0100 Subject: command-line-tool: Implement GuixManifestRequirement. * ravanan/command-line-tool.scm (%command-line-tool-supported-requirements): Add GuixManifestRequirement. (build-command-line-tool-script): Implement GuixManifestRequirement. --- ravanan/command-line-tool.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm index 19f3703..17a67a1 100644 --- a/ravanan/command-line-tool.scm +++ b/ravanan/command-line-tool.scm @@ -69,6 +69,7 @@ (define %command-line-tool-supported-requirements (list "EnvVarRequirement" + "GuixManifestRequirement" "InlineJavascriptRequirement" "InitialWorkDirRequirement" "ResourceRequirement")) @@ -732,7 +733,13 @@ named @var{name} with @var{inputs} using tools from Guix manifest in #()))) (initial-work-dir-requirement (find-requirement requirements "InitialWorkDirRequirement")) - (manifest (load-manifest manifest-file))) + (manifest + (load-manifest + (from-maybe + (maybe-bind (find-requirement requirements "GuixManifestRequirement") + (compose just + (cut assoc-ref* <> "manifest"))) + manifest-file)))) (with-imported-modules (source-module-closure '((ravanan work command-line-tool) (ravanan work monads) (ravanan work ui) -- cgit v1.2.3