diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
| commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
| tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /Makefile.am | |
| parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
| parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
| download | guix-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 4805c80153..9c29e01452 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 Mark H Weaver <mhw@netris.org> +# Copyright © 2016, 2017, 2018 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> @@ -254,6 +254,9 @@ dist_noinst_DATA = guix/tests.scm guix/tests/http.scm # Auxiliary files for packages. AUX_FILES = \ gnu/packages/aux-files/emacs/guix-emacs.el \ + gnu/packages/aux-files/linux-libre/4.15-arm.conf \ + gnu/packages/aux-files/linux-libre/4.15-i686.conf \ + gnu/packages/aux-files/linux-libre/4.15-x86_64.conf \ gnu/packages/aux-files/linux-libre/4.14-arm.conf \ gnu/packages/aux-files/linux-libre/4.14-i686.conf \ gnu/packages/aux-files/linux-libre/4.14-x86_64.conf \ @@ -450,6 +453,7 @@ EXTRA_DIST = \ CODE-OF-CONDUCT \ .dir-locals.el \ bin/guix.in \ + etc/guix-install.sh \ build-aux/build-self.scm \ build-aux/compile-all.scm \ build-aux/hydra/evaluate.scm \ |