diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-09 23:54:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-09 23:54:37 +0100 |
| commit | 4d152bf1d9ff894119e913e6506632348107cf65 (patch) | |
| tree | c44f06f725e3a398bd7698dd2b58480d356021b8 /Makefile.am | |
| parent | 4ce823c4241ff941ca301c39db23ab91eeaa1ac9 (diff) | |
| parent | 3259877d3563ac022633fbd8b73134a10567331e (diff) | |
| download | patches-4d152bf1d9ff894119e913e6506632348107cf65.tar patches-4d152bf1d9ff894119e913e6506632348107cf65.tar.gz | |
Merge branch 'master' into nix-integration
Conflicts:
guix/store.scm
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 49e0c3016a..0b59f8901c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,8 @@ MODULES = \ guix/utils.scm \ guix/derivations.scm \ guix/download.scm \ + guix/gnu-maintenance.scm \ + guix/licenses.scm \ guix/build-system.scm \ guix/build-system/gnu.scm \ guix/build-system/trivial.scm \ @@ -41,6 +43,8 @@ MODULES = \ guix/snix.scm \ guix.scm \ distro.scm \ + distro/packages/acl.scm \ + distro/packages/attr.scm \ distro/packages/autotools.scm \ distro/packages/base.scm \ distro/packages/bash.scm \ @@ -172,6 +176,7 @@ TESTS = \ tests/build-utils.scm \ tests/packages.scm \ tests/snix.scm \ + tests/store.scm \ tests/union.scm \ tests/guix-build.sh \ tests/guix-download.sh \ |