diff options
author | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
commit | 1524851f58d8d69f6c6e1c6406cf174083bbe82d (patch) | |
tree | d7c63b716501e4423e9f7173790a8cc4c3962935 /Makefile.am | |
parent | 0802f3a034815576bf0e28c59c968400566b418b (diff) | |
parent | ed9fb46b16cf7632e6df15c52c7183807fe5d1f9 (diff) | |
download | guix-1524851f58d8d69f6c6e1c6406cf174083bbe82d.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c9671e2d14..db4ebe04dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,9 @@ MODULES = \ guix/upstream.scm \ guix/licenses.scm \ guix/graph.scm \ + guix/cache.scm \ guix/cve.scm \ + guix/workers.scm \ guix/zlib.scm \ guix/build-system.scm \ guix/build-system/ant.scm \ @@ -185,7 +187,8 @@ if HAVE_GUILE_SSH MODULES += \ guix/ssh.scm \ - guix/scripts/copy.scm + guix/scripts/copy.scm \ + guix/store/ssh.scm endif HAVE_GUILE_SSH @@ -295,7 +298,9 @@ SCM_TESTS = \ tests/size.scm \ tests/graph.scm \ tests/challenge.scm \ + tests/cache.scm \ tests/cve.scm \ + tests/workers.scm \ tests/zlib.scm \ tests/file-systems.scm \ tests/system.scm \ |