diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-03-05 22:56:40 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-03-06 00:18:30 +0000 |
| commit | a8448da0f4a090818104e64dd79f90b0e50d5e77 (patch) | |
| tree | 494c58b4724f12cd9de0db9b0a7096de2b922c0f /Makefile.am | |
| parent | 4f4b749e75b38b8c08b4f67ef51c2c8740999e28 (diff) | |
| parent | a714af38d5d1046081524d859cde4cd8fd12a923 (diff) | |
| download | guix-a8448da0f4a090818104e64dd79f90b0e50d5e77.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 5c2461802b..5387ac7b9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,6 +114,7 @@ MODULES = \ guix/channels.scm \ guix/gnu-maintenance.scm \ guix/self.scm \ + guix/substitutes.scm \ guix/upstream.scm \ guix/licenses.scm \ guix/lint.scm \ @@ -359,6 +360,10 @@ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/guix.vim \ + gnu/packages/aux-files/linux-libre/5.11-arm.conf \ + gnu/packages/aux-files/linux-libre/5.11-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.11-i686.conf \ + gnu/packages/aux-files/linux-libre/5.11-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.10-arm.conf \ gnu/packages/aux-files/linux-libre/5.10-arm64.conf \ gnu/packages/aux-files/linux-libre/5.10-i686.conf \ @@ -476,6 +481,7 @@ SCM_TESTS = \ tests/scripts.scm \ tests/search-paths.scm \ tests/services.scm \ + tests/services/file-sharing.scm \ tests/services/linux.scm \ tests/sets.scm \ tests/size.scm \ |