rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gexp: 'directory-union' has a #:resolve-collision parameter. 

* guix/gexp.scm (directory-union): Add #:resolve-collision and honor it.
This commit is contained in:
Ludovic Courtès 2018-04-08 16:22:25 +02:00
parent e40aa54e98
commit b244ae25f9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
guix/gexp.scm
View File

@ -1250,7 +1250,8 @@ This yields an 'etc' directory containing these two files."
files))))))
(define* (directory-union name things
#:key (copy? #f) (quiet? #f))
#:key (copy? #f) (quiet? #f)
(resolve-collision 'warn-about-collision))
"Return a directory that is the union of THINGS, where THINGS is a list of
file-like objects denoting directories. For example:
@ -1258,6 +1259,10 @@ file-like objects denoting directories. For example:
yields a directory that is the union of the 'guile' and 'emacs' packages.
Call RESOLVE-COLLISION when several files collide, passing it the list of
colliding files. RESOLVE-COLLISION must return the chosen file or #f, in
which case the colliding entry is skipped altogether.
When HARD-LINKS? is true, create hard links instead of symlinks. When QUIET?
is true, the derivation will not print anything."
(define symlink
@ -1281,12 +1286,16 @@ is true, the derivation will not print anything."
(computed-file name
(with-imported-modules '((guix build union))
(gexp (begin
(use-modules (guix build union))
(use-modules (guix build union)
(srfi srfi-1)) ;for 'first' and 'last'
(union-build (ungexp output)
'(ungexp things)
#:log-port (ungexp log-port)
#:symlink (ungexp symlink)))))))))
#:symlink (ungexp symlink)
#:resolve-collision
(ungexp resolve-collision)))))))))
;;;