diff options
author | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
---|---|---|
committer | 宋文武 <iyzsong@gmail.com> | 2015-04-08 16:04:37 +0800 |
commit | cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc (patch) | |
tree | b4ce7938c855781af2e0a1e68b3588f96de7e7e1 /Makefile.am | |
parent | 4ae7559fd62c03a800b010c228639f18b9f58006 (diff) | |
parent | 068a53c36dec5ace42cc3ea89060d9a485592f08 (diff) | |
download | patches-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar patches-cf3e3e374c4bd1c9f0f976fc8f02f66aff6417dc.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index cf709986ed..d54e281163 100644 --- a/Makefile.am +++ b/Makefile.am @@ -105,6 +105,7 @@ MODULES = \ guix/scripts/import/gnu.scm \ guix/scripts/import/nix.scm \ guix/scripts/environment.scm \ + guix/scripts/publish.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) @@ -180,7 +181,8 @@ SCM_TESTS = \ tests/profiles.scm \ tests/syscalls.scm \ tests/gremlin.scm \ - tests/lint.scm + tests/lint.scm \ + tests/publish.scm if HAVE_GUILE_JSON @@ -203,6 +205,7 @@ SH_TESTS = \ tests/guix-gc.sh \ tests/guix-hash.sh \ tests/guix-package.sh \ + tests/guix-package-net.sh \ tests/guix-system.sh \ tests/guix-archive.sh \ tests/guix-authenticate.sh \ |