diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-10-16 10:41:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-11-21 23:09:16 +0100 |
| commit | 5f93d97005897c2d859f0be1bdff34c88467ec61 (patch) | |
| tree | 7300a455807b02f7dd416cbb7b33aad7bd83322e /Makefile.am | |
| parent | fe9b3ec3ee208c5bac7844f3d0fecce2c6b1297d (diff) | |
Add (guix self) and use it when pulling.
This mitigates <https://bugs.gnu.org/27284>.
* guix/self.scm: New file.
* Makefile.am (MODULES): Add it.
* build-aux/build-self.scm (libgcrypt, zlib, gzip, bzip2, xz)
(false-if-wrong-guile, package-for-current-guile, guile-json)
(guile-ssh, guile-git, guile-bytestructures): Remove.
(build): Rewrite to simply delegate to 'compiled-guix'.
* gnu/packages.scm (%distro-root-directory): Rewrite to try different
directories.
* guix/discovery.scm (guix): Export 'scheme-files'.
* guix/scripts/pull.scm (build-and-install): Split into...
(install-latest): ... this. New procedure. And...
(build-and-install): ... this, which now takes a monadic value argument.
(indirect-root-added): Remove.
(guix-pull): Call 'add-indirect-root'. Call 'build-from-source' and
pass the result to 'build-and-install'.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 925dd0a25a..a4156c834d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ MODULES = \ guix/derivations.scm \ guix/grafts.scm \ guix/gnu-maintenance.scm \ + guix/self.scm \ guix/upstream.scm \ guix/licenses.scm \ guix/git.scm \ |