14328b81a2
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. |
||
---|---|---|
.. | ||
accounts.scm | ||
base16.scm | ||
base32.scm | ||
base64.scm | ||
bournish.scm | ||
build-utils.scm | ||
builders.scm | ||
cache.scm | ||
challenge.scm | ||
channels.scm | ||
combinators.scm | ||
containers.scm | ||
cpan.scm | ||
cpio.scm | ||
cran.scm | ||
crate.scm | ||
cve-sample.xml | ||
cve.scm | ||
debug-link.scm | ||
derivations.scm | ||
discovery.scm | ||
elpa.scm | ||
file-systems.scm | ||
gem.scm | ||
gexp.scm | ||
glob.scm | ||
gnu-maintenance.scm | ||
grafts.scm | ||
graph.scm | ||
gremlin.scm | ||
guix-archive.sh | ||
guix-authenticate.sh | ||
guix-build-branch.sh | ||
guix-build.sh | ||
guix-daemon.sh | ||
guix-describe.sh | ||
guix-download.sh | ||
guix-environment-container.sh | ||
guix-environment.sh | ||
guix-gc.sh | ||
guix-graph.sh | ||
guix-hash.sh | ||
guix-lint.sh | ||
guix-pack-localstatedir.sh | ||
guix-pack-relocatable.sh | ||
guix-pack.sh | ||
guix-package-net.sh | ||
guix-package.sh | ||
guix-system.sh | ||
hackage.scm | ||
import-utils.scm | ||
inferior.scm | ||
lint.scm | ||
modules.scm | ||
monads.scm | ||
nar.scm | ||
opam.scm | ||
pack.scm | ||
packages.scm | ||
pki.scm | ||
print.scm | ||
processes.scm | ||
profiles.scm | ||
publish.scm | ||
pypi.scm | ||
records.scm | ||
scripts-build.scm | ||
scripts.scm | ||
search-paths.scm | ||
services.scm | ||
sets.scm | ||
signing-key.pub | ||
signing-key.sec | ||
size.scm | ||
snix.scm | ||
status.scm | ||
store-database.scm | ||
store-deduplication.scm | ||
store.scm | ||
substitute.scm | ||
syscalls.scm | ||
system.scm | ||
test.drv | ||
texlive.scm | ||
ui.scm | ||
union.scm | ||
upstream.scm | ||
utils.scm | ||
uuid.scm | ||
workers.scm | ||
zlib.scm |