diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-10-27 18:09:00 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-11-02 21:22:12 +0100 |
| commit | 05962f2958eb98bad384702455236ff9d2acfb39 (patch) | |
| tree | 519d31fb05176a3ec0e9918fc746ede76a071c7f /gnu/packages/bootstrap.scm | |
| parent | 50373bab7a084dc28a48df2ca7e16036d8978182 (diff) | |
| download | guix-05962f2958eb98bad384702455236ff9d2acfb39.tar guix-05962f2958eb98bad384702455236ff9d2acfb39.tar.gz | |
packages: Implement grafts.
Thanks to Mark H. Weaver <mhw@netris.org> for insightful discussions
and suggestions.
* guix/packages.scm (<package>)[graft]: New field.
(patch-and-repack): Invoke 'package-derivation' with #:graft? #f.
(package-source-derivation): Likewise. Do not use (%guile-for-build)
in call to 'patch-and-repack', and we could end up using a grafted
Guile.
(expand-input): Likewise, also for 'package-cross-derivation' call.
(package->bag): Add #:graft? parameter. Honor it. Use 'strip-append'
instead of 'package-full-name'.
(input-graft, input-cross-graft, bag-grafts, package-grafts): New
procedures.
(package-derivation, package-cross-derivation): Add #:graft? parameter
and honor it.
* gnu/packages/bootstrap.scm (package-with-bootstrap-guile): Add
recursive call on 'graft'.
* guix/build-system/gnu.scm (package-with-explicit-inputs,
package-with-extra-configure-variable, static-package): Likewise.
(gnu-build): Use the ungrafted Guile to avoid full rebuilds.
(gnu-cross-build): Likewise.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
* tests/packages.scm ("package-derivation, direct graft",
"package-cross-derivation, direct graft", "package-grafts,
indirect grafts", "package-grafts, indirect grafts, cross",
"package-grafts, indirect grafts, propagated inputs",
"package-derivation, indirect grafts"): New tests.
("bag->derivation", "bag->derivation, cross-compilation"): Wrap in
'parameterize'.
* doc/guix.texi (Security Updates): New node.
(Invoking guix build): Document --no-graft.
Diffstat (limited to 'gnu/packages/bootstrap.scm')
| -rw-r--r-- | gnu/packages/bootstrap.scm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index e617093fb3..33b61aa0be 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -146,7 +146,9 @@ check whether everything is alright." (native-inputs (map rewritten-input (package-native-inputs p))) (propagated-inputs (map rewritten-input - (package-propagated-inputs p))))))) + (package-propagated-inputs p))) + (replacement (and=> (package-replacement p) + package-with-bootstrap-guile)))))) (define* (glibc-dynamic-linker #:optional (system (or (and=> (%current-target-system) |