diff options
| author | Attila Lendvai <attila@lendvai.name> | 2021-10-03 14:43:02 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2022-09-02 17:04:46 +0200 |
| commit | 42e3089752b9fdfd0569b990085fc1cd5cd75f77 (patch) | |
| tree | 324baecdb46029555832def667be8e976c3b0067 /guix/gexp.scm | |
| parent | e4adc665e1ce4fe5341eda12157460ac3bd87aec (diff) | |
| download | guix-42e3089752b9fdfd0569b990085fc1cd5cd75f77.tar guix-42e3089752b9fdfd0569b990085fc1cd5cd75f77.tar.gz | |
guix: build: Factor out default collision-resolver.
This prepares the stage for new collision resolvers without changing the
underlying semantics too much.
* guix/build/union.scm (resolve+warn-if-harmful): New variable.
(warn-about-collision): Rename to...
(resolve-collision/default): ... this. Implement in terms of
resolve+warn-if-harmful.
(union-build): Adjust accordingly.
* guix/gexp.scm (directory-union): Likewise.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Diffstat (limited to 'guix/gexp.scm')
| -rw-r--r-- | guix/gexp.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm index 73595a216b..a50b93ed48 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -2128,7 +2128,7 @@ This yields an 'etc' directory containing these two files." (define* (directory-union name things #:key (copy? #f) (quiet? #f) - (resolve-collision 'warn-about-collision)) + (resolve-collision 'resolve-collision/default)) "Return a directory that is the union of THINGS, where THINGS is a list of file-like objects denoting directories. For example: |