diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-29 22:39:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-29 22:39:46 +0100 |
| commit | c8c88afaa14f760ec71ffb2ef0d712b7e42cc71f (patch) | |
| tree | 3d7a2a037683dc02fa55fc27e575ae1483da7fa0 /Makefile.am | |
| parent | 48da001fd96bb9ff063b512666f5122b83bc210d (diff) | |
| download | guix-c8c88afaa14f760ec71ffb2ef0d712b7e42cc71f.tar guix-c8c88afaa14f760ec71ffb2ef0d712b7e42cc71f.tar.gz | |
Add (guix build union).
* guix/build/union.scm, tests/union.scm: New files.
* Makefile.am (MODULES): Add `guix/build/union.scm'.
(TESTS): Add `tests/union.scm'.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 10f3b61702..75e479ddc4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,6 +34,7 @@ MODULES = \ guix/build/ftp.scm \ guix/build/http.scm \ guix/build/utils.scm \ + guix/build/union.scm \ guix/packages.scm \ guix.scm \ distro.scm \ @@ -116,7 +117,8 @@ TESTS = \ tests/derivations.scm \ tests/utils.scm \ tests/build-utils.scm \ - tests/packages.scm + tests/packages.scm \ + tests/union.scm LOG_COMPILER = \ $(top_builddir)/pre-inst-env \ |