aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2025-02-24 16:51:18 +0000
committerArun Isaac2025-02-24 16:51:18 +0000
commit834abdd71cfffe3a51e44ea92f198538f4968f3e (patch)
treea0a6b8a426dfd89f7506715e4b3daa8848c3e5b6
parenta53b454ea4f98449c2ebb422bd38740f9a4b38d8 (diff)
downloadravanan-834abdd71cfffe3a51e44ea92f198538f4968f3e.tar.gz
ravanan-834abdd71cfffe3a51e44ea92f198538f4968f3e.tar.lz
ravanan-834abdd71cfffe3a51e44ea92f198538f4968f3e.zip
command-line-tool: Pass package versions separately to inferior.
* ravanan/command-line-tool.scm (software-packages->environment): Pass package versions as separate argument to lookup-inferior-packages.
-rw-r--r--ravanan/command-line-tool.scm22
1 files changed, 12 insertions, 10 deletions
diff --git a/ravanan/command-line-tool.scm b/ravanan/command-line-tool.scm
index 82be35e..6843ff5 100644
--- a/ravanan/command-line-tool.scm
+++ b/ravanan/command-line-tool.scm
@@ -612,21 +612,23 @@ standard. Connect to the Guix daemon specified by @var{guix-daemon-socket}. If
(compose (cut manifest->environment <> guix-daemon-socket)
packages->manifest))
- (define specifications
- (vector-map->list softare-package->package-specification
- packages))
-
(if channels
(call-with-inferior (inferior-for-channels channels)
(lambda (inferior)
(packages->environment
- (map (lambda (specification)
- (match (lookup-inferior-packages inferior specification)
- ((inferior-package _ ...)
- inferior-package)))
- specifications))))
+ (vector-map->list (lambda (package)
+ (let ((name (assoc-ref package "package"))
+ (version (assoc-ref package "version")))
+ (match (lookup-inferior-packages inferior
+ name
+ version)
+ ((inferior-package _ ...)
+ inferior-package))))
+ packages))))
(packages->environment
- (map specification->package specifications))))
+ (vector-map->list (compose specification->package
+ software-package->package-specification)
+ packages))))
(define (manifest->environment manifest guix-daemon-socket)
"Build @var{manifest} and return an association list of environment