From 4ca0b4101d2d15fc41c0a875f09553ded27091bd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 26 Jul 2014 22:21:43 +0200 Subject: profiles: Get rid of the 'inputs' field of 'manifest-entry'. * guix/profiles.scm ()[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. --- guix/scripts/package.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'guix/scripts') 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 -- cgit v1.2.3