diff options
author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2019-03-13 10:11:54 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-17 22:55:01 +0100 |
commit | 14328b81a224b726f39dd030886ba8d332027427 (patch) | |
tree | a530e4445d30b7babd0b1131f6bcb8204a73c1e3 /scripts | |
parent | 0c0ff42a243b2da4f1deb52fe3961801008341da (diff) | |
download | patches-14328b81a224b726f39dd030886ba8d332027427.tar patches-14328b81a224b726f39dd030886ba8d332027427.tar.gz |
guix build: Transformation options match packages by spec.
This allows us to combine several transformations on a given package, in
particular '--with-git-url' and '--with-branch'.
Previously transformations would ignore each other since they would all
take (specification->package SOURCE) as their replacement source,
compare it by identity, which doesn't work if a previous transformation
has already changed SOURCE.
* guix/scripts/build.scm (evaluate-replacement-specs): Adjust to produce
an alist as expected by 'package-input-rewriting/spec', with a package
spec as the first element of each pair.
(evaluate-git-replacement-specs): Likewise.
(transform-package-inputs): Adjust accordingly and use
'package-input-rewriting/spec'.
(transform-package-inputs/graft): Likewise.
(transform-package-source-branch, transform-package-source-commit): Use
'package-input-rewriting/spec'.
(transform-package-source-git-url): Likewise, and adjust the
REPLACEMENTS alist accordingly.
(options->transformation): Iterate over OPTS instead of over
%TRANSFORMATIONS. Invoke transformations one by one.
* tests/scripts-build.scm ("options->transformation, with-input"):
Adjust test to compare packages by name rather than by identity.
("options->transformation, with-git-url + with-branch"): New test.
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions