summaryrefslogtreecommitdiff
path: root/guix/scripts/package.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-07-26 22:21:43 +0200
committerLudovic Courtès <ludo@gnu.org>2014-07-26 22:56:59 +0200
commit4ca0b4101d2d15fc41c0a875f09553ded27091bd (patch)
treeafcecf677702cec1f7810f63d4e6335df8a6169a /guix/scripts/package.scm
parenta54c94a40d3d87c80034793795bf13fd7abf7a6e (diff)
profiles: Get rid of the 'inputs' field of 'manifest-entry'.
* guix/profiles.scm (<manifest-entry>)[inputs]: Remove. (profile-derivation): Rely on 'item' and 'deps' instead of 'inputs'. Adjust 'builder' accordingly. * guix/scripts/package.scm (options->installable)[package->manifest-entry]: Remove 'inputs' field. Change 'dependencies' field to contain packages.
Diffstat (limited to 'guix/scripts/package.scm')
-rw-r--r--guix/scripts/package.scm11
1 files changed, 7 insertions, 4 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index bc2c854853..3fe7385bc2 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -647,15 +647,18 @@ return the new list of manifest entries."
;; When given a package via `-e', install the first of its
;; outputs (XXX).
(let* ((output (or output (car (package-outputs p))))
- (deps (deduplicate (package-transitive-propagated-inputs p))))
+ (deps (map (match-lambda
+ ((label package)
+ `(,package "out"))
+ ((label package output)
+ `(,package ,output)))
+ (package-transitive-propagated-inputs p))))
(manifest-entry
(name (package-name p))
(version (package-version p))
(output output)
(item p)
- (dependencies deps)
- (inputs (cons (list (package-name p) p output)
- deps)))))
+ (dependencies (delete-duplicates deps)))))
(define upgrade-regexps
(filter-map (match-lambda