diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-21 23:42:10 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-21 23:42:10 +0100 |
| commit | bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e (patch) | |
| tree | 9fbf0642fe71d0d4f6d7cb4e85b4d1587c8b9b16 /Makefile.am | |
| parent | 034cfbd2449387c15823cd9ec3e91661f9e5bf49 (diff) | |
| parent | f00e68ace070fd5240a4b5874e61c26f6e909b6c (diff) | |
| download | guix-bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e.tar guix-bbe4ed65ed5fe7dc8ed9d226042852387cee3b1e.tar.gz | |
Merge branch 'master' into ungrafting
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 \ |