futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

profiles: Fix removal of the next-to-last item in a profile.

Browse Source 
Fixes a bug whereby removing the next-to-last item in a profile would
lead to an obscure error, as shown at
<http://lists.gnu.org/archive/html/guix-devel/2014-12/msg00292.html>.
Reported by Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>.

* guix/profiles.scm (profile-derivation)[inputs]: Use (list info-dir
  "out") instead of just INFO-DIR.
This commit is contained in:
Ludovic Courtès 2014-12-15 23:01:16 +01:00
parent ebf5ad46db
commit bea26837e8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/profiles.scm
View File

@ -414,7 +414,13 @@ INFO-DIR? is #f."
(return #f)))) (return #f))))
(define inputs (define inputs
(if info-dir (if info-dir
(cons info-dir (manifest-inputs manifest)) ;; XXX: Here we use the tuple (INFO-DIR "out") just so that the list
;; is unambiguous for the gexp code when MANIFEST has a single input
;; denoted as a string (the pattern (DRV STRING) is normally
;; interpreted in a gexp as "the STRING output of DRV".). See
;; <http://lists.gnu.org/archive/html/guix-devel/2014-12/msg00292.html>.
(cons (list info-dir "out")
(manifest-inputs manifest))
(manifest-inputs manifest))) (manifest-inputs manifest)))
(define builder (define builder