nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

union: Delete duplicates when passed the same input several times. 

* guix/build/union.scm (union-build): Prepend "." to the result of
  `union-tree', to match the expectations of `delete-duplicate-leaves'.
  Don't do mkdir when SUBDIR is ".".
* tests/union.scm ("union-build"): Keep duplicates in %BOOTSTRAP-INPUTS.
master
Ludovic Courtès 2013-02-06 22:51:24 +01:00
parent 44ce77ff52
commit 6211223021
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build/union.scm
View File

@ -150,8 +150,9 @@ the DIRECTORIES."
(mkdir output)
(let loop ((tree (delete-duplicate-leaves
(tree-union (append-map (compose tree-leaves file-tree)
directories))
(cons "."
(tree-union (append-map (compose tree-leaves file-tree)
directories)))
leaf=?
resolve-collision))
(dir '()))
@ -165,8 +166,9 @@ the DIRECTORIES."
(symlink tree target)))
(((? string? subdir) leaves ...)
;; A sub-directory: create it in OUTPUT, and iterate over LEAVES.
(let ((dir (string-join dir "/")))
(mkdir (string-append output "/" dir "/" subdir)))
(unless (string=? subdir ".")
(let ((dir (string-join dir "/")))
(mkdir (string-append output "/" dir "/" subdir))))
(for-each (cute loop <> `(,@dir ,subdir))
leaves))
((leaves ...)

7
tests/union.scm
View File

@ -94,9 +94,10 @@
(let* ((inputs (map (match-lambda
((name package)
`(,name ,(package-derivation %store package))))
(delete-duplicates %bootstrap-inputs
(lambda (i1 i2)
(eq? (second i1) (second i2))))))
;; Purposefully leave duplicate entries.
(append %bootstrap-inputs
(take %bootstrap-inputs 3))))
(builder `(begin
(use-modules (guix build union))
(union-build (assoc-ref %outputs "out")