diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 22:06:54 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-01-08 22:06:54 +0100 |
| commit | 2f265602ff23e41f75932aa568fe62e149e3cb9d (patch) | |
| tree | 3ff7d0b4be81246a4dfd3df414e163d8cbdc4990 /Makefile.am | |
| parent | aa6b0d6bf01aba60c6b5524e4422e7a4cebf01e4 (diff) | |
| parent | 1d6816f98ca1746f0b627a6dee9c0adbbf7533c4 (diff) | |
| download | patches-2f265602ff23e41f75932aa568fe62e149e3cb9d.tar patches-2f265602ff23e41f75932aa568fe62e149e3cb9d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index eb278a76e9..6d6aba059b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,6 +30,8 @@ MODULES = \ guix/base32.scm \ guix/records.scm \ guix/hash.scm \ + guix/pk-crypto.scm \ + guix/pki.scm \ guix/utils.scm \ guix/download.scm \ guix/monads.scm \ @@ -66,12 +68,14 @@ MODULES = \ guix/snix.scm \ guix/scripts/download.scm \ guix/scripts/build.scm \ + guix/scripts/archive.scm \ guix/scripts/import.scm \ guix/scripts/package.scm \ guix/scripts/gc.scm \ guix/scripts/hash.scm \ guix/scripts/pull.scm \ guix/scripts/substitute-binary.scm \ + guix/scripts/authenticate.scm \ guix/scripts/refresh.scm \ guix.scm \ $(GNU_SYSTEM_MODULES) @@ -107,6 +111,8 @@ clean-go: SCM_TESTS = \ tests/base32.scm \ tests/hash.scm \ + tests/pk-crypto.scm \ + tests/pki.scm \ tests/builders.scm \ tests/derivations.scm \ tests/ui.scm \ @@ -126,7 +132,9 @@ SH_TESTS = \ tests/guix-download.sh \ tests/guix-gc.sh \ tests/guix-hash.sh \ - tests/guix-package.sh + tests/guix-package.sh \ + tests/guix-archive.sh \ + tests/guix-authenticate.sh if BUILD_DAEMON @@ -170,6 +178,8 @@ EXTRA_DIST = \ srfi/srfi-64.scm \ srfi/srfi-64.upstream.scm \ tests/test.drv \ + tests/signing-key.pub \ + tests/signing-key.sec \ build-aux/config.rpath \ bootstrap \ release.nix \ |