diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-13 12:14:08 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-13 12:14:08 -0500 |
| commit | a813710a5fb0822e9d95088462d70f6522fe8457 (patch) | |
| tree | 35299db4712eda92c809635716d530d085223e81 /Makefile.am | |
| parent | d8cd15949092b7cd90ee1dcc4aefe87b3ba4a6fb (diff) | |
| parent | 765f0ac8f9f67f775a667a4276faf85ddde6d7ea (diff) | |
| download | guix-patches-a813710a5fb0822e9d95088462d70f6522fe8457.tar guix-patches-a813710a5fb0822e9d95088462d70f6522fe8457.tar.gz | |
Merge branch 'master' into core-updates
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 5ee743470b..c482848fdf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013 Andreas Enge <andreas@enge.fr> # # This file is part of GNU Guix. @@ -34,6 +34,7 @@ MODULES = \ guix/pk-crypto.scm \ guix/pki.scm \ guix/utils.scm \ + guix/sets.scm \ guix/download.scm \ guix/git-download.scm \ guix/monads.scm \ @@ -153,6 +154,7 @@ SCM_TESTS = \ tests/hash.scm \ tests/pk-crypto.scm \ tests/pki.scm \ + tests/sets.scm \ tests/substitute-binary.scm \ tests/builders.scm \ tests/derivations.scm \ |