From 1beff9ccc0e46da496c7b9c828f9425861e3416d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sun, 27 Oct 2024 02:56:30 +0000 Subject: command-line-tool: Fit Guix manifest into SoftwareRequirement. * ravanan/command-line-tool.scm (%command-line-tool-supported-requirements): Replace GuixManifestRequirement with SoftwareRequirement. (build-command-line-tool-script): Look for SoftwareRequirement instead of GuixManifestRequirement. --- ravanan/command-line-tool.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm index f2aec4a..250f5b2 100644 --- a/ravanan/command-line-tool.scm +++ b/ravanan/command-line-tool.scm @@ -70,10 +70,10 @@ (define %command-line-tool-supported-requirements (list "EnvVarRequirement" - "GuixManifestRequirement" "InlineJavascriptRequirement" "InitialWorkDirRequirement" - "ResourceRequirement")) + "ResourceRequirement" + "SoftwareRequirement")) (define (command-line-tool-supported-requirements batch-system) (cond @@ -740,7 +740,7 @@ named @var{name} with @var{inputs} using tools from Guix manifest in (manifest (load-manifest (from-maybe - (maybe-bind (find-requirement requirements "GuixManifestRequirement") + (maybe-bind (find-requirement requirements "SoftwareRequirement") (compose just (cut assoc-ref* <> "manifest"))) manifest-file)))) -- cgit v1.2.3