about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2024-10-27 02:56:30 +0000
committerArun Isaac2024-11-06 00:37:10 +0000
commit1beff9ccc0e46da496c7b9c828f9425861e3416d (patch)
treeb254d40facfc3ae2db9e0b7cbbe3da089179b814
parentdcdfae66509895ec6513b1d0ada365e89abf869f (diff)
downloadravanan-1beff9ccc0e46da496c7b9c828f9425861e3416d.tar.gz
ravanan-1beff9ccc0e46da496c7b9c828f9425861e3416d.tar.lz
ravanan-1beff9ccc0e46da496c7b9c828f9425861e3416d.zip
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.
-rw-r--r--ravanan/command-line-tool.scm6
1 files 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))))