diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:48:42 +0200 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2019-01-09 10:52:41 +0200 |
commit | 0e289672503a4e1599ef826d49f2fa5575081942 (patch) | |
tree | cdaec28207956090b7cebff805135754dcb22f06 /Makefile.am | |
parent | 0109b89c5834b5374f248dc3681702180013f41f (diff) | |
parent | 6df4d8338d2bf94ab729e3b12e42ace0a06687ae (diff) | |
download | guix-0e289672503a4e1599ef826d49f2fa5575081942.tar.gz |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 0e5ca02ed3..9f30d5b2b0 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, 2018 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 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> @@ -172,7 +172,6 @@ MODULES = \ guix/build/union.scm \ guix/build/profiles.scm \ guix/build/compile.scm \ - guix/build/pull.scm \ guix/build/rpath.scm \ guix/build/cvs.scm \ guix/build/svn.scm \ @@ -281,6 +280,10 @@ 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.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/4.19-arm.conf \ gnu/packages/aux-files/linux-libre/4.19-arm64.conf \ gnu/packages/aux-files/linux-libre/4.19-i686.conf \ |