diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
| commit | 8c5533b582bc3fe1293469771d1a326926e84586 (patch) | |
| tree | 7f71c4dd85489139a11897ee2668e26acdaf40b0 /Makefile.am | |
| parent | 2b0c755d195c79bfc95cdbe802e1e2dea1adb7a2 (diff) | |
| parent | 41ce92501b53caa1dcf89fa81aed71dbf1f85d34 (diff) | |
| download | guix-8c5533b582bc3fe1293469771d1a326926e84586.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 6caf588754..cf35770ba7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ # Copyright © 2013 Andreas Enge <andreas@enge.fr> # Copyright © 2015, 2017 Alex Kost <alezost@gmail.com> # Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org> -# Copyright © 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> +# Copyright © 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org> # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017 Leo Famulari <leo@famulari.name> # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> @@ -283,10 +283,10 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/4.20-arm.conf \ - gnu/packages/aux-files/linux-libre/4.20-arm64.conf \ - gnu/packages/aux-files/linux-libre/4.20-i686.conf \ - gnu/packages/aux-files/linux-libre/4.20-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.0-arm.conf \ + gnu/packages/aux-files/linux-libre/5.0-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.0-i686.conf \ + gnu/packages/aux-files/linux-libre/5.0-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.19-arm.conf \ gnu/packages/aux-files/linux-libre/4.19-arm64.conf \ gnu/packages/aux-files/linux-libre/4.19-i686.conf \ @@ -392,6 +392,7 @@ SCM_TESTS = \ tests/file-systems.scm \ tests/uuid.scm \ tests/system.scm \ + tests/accounts.scm \ tests/services.scm \ tests/scripts-build.scm \ tests/containers.scm \ |