diff options
author | Marius Bakke <marius@gnu.org> | 2020-12-21 23:44:54 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-12-21 23:44:54 +0100 |
commit | 119fd58922b00d43d4f8b055f3f622478a13f46d (patch) | |
tree | 4869f9f09079d5a33f7dfd51ca8e52200fbeb09f /Makefile.am | |
parent | 85ba5e9335207beef9a650e96d5d64787beb9256 (diff) | |
parent | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (diff) | |
download | guix-119fd58922b00d43d4f8b055f3f622478a13f46d.tar.gz |
Merge branch 'ungrafting' into staging
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 9803ba5dc7..e0ee65fcce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -356,10 +356,15 @@ dist_noinst_DATA = \ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ - gnu/packages/aux-files/linux-libre/5.9-arm.conf \ - gnu/packages/aux-files/linux-libre/5.9-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.9-i686.conf \ - gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \ + gnu/packages/aux-files/guix.vim \ + 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 \ + gnu/packages/aux-files/linux-libre/5.10-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.9-arm.conf \ + gnu/packages/aux-files/linux-libre/5.9-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.9-i686.conf \ + gnu/packages/aux-files/linux-libre/5.9-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \ gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ gnu/packages/aux-files/linux-libre/5.4-i686.conf \ |