diff options
| author | Leo Famulari <leo@famulari.name> | 2018-03-06 13:39:12 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-03-06 13:39:12 -0500 |
| commit | 613ef763a52d7825f062eb7b58354504b64d2869 (patch) | |
| tree | bee086914ed97aab1eaba25c325268e33e57c358 /Makefile.am | |
| parent | 86990eeda2a85acd3640059c0b681f1eddbacba0 (diff) | |
| parent | 8a325748fb8c3709beb2c26966a3e3c86831f95e (diff) | |
| download | guix-613ef763a52d7825f062eb7b58354504b64d2869.tar guix-613ef763a52d7825f062eb7b58354504b64d2869.tar.gz | |
Merge branch 'master' into staging
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 e2c940ca8d..6556799e6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> # Copyright © 2013 Andreas Enge <andreas@enge.fr> # Copyright © 2015, 2017 Alex Kost <alezost@gmail.com> # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org> @@ -83,6 +83,7 @@ MODULES = \ guix/gnu-maintenance.scm \ guix/upstream.scm \ guix/licenses.scm \ + guix/glob.scm \ guix/git.scm \ guix/graph.scm \ guix/cache.scm \ @@ -314,6 +315,7 @@ SCM_TESTS = \ tests/substitute.scm \ tests/builders.scm \ tests/derivations.scm \ + tests/glob.scm \ tests/grafts.scm \ tests/ui.scm \ tests/records.scm \ |