diff options
| author | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
| commit | 5c3cb22c9b2810669999e044b2de5e9331011a83 (patch) | |
| tree | 3276e19cc1a0af3cece6ce4f2bfa930901888bb4 /Makefile.am | |
| parent | c896287ce5eff968a0b323f3a069653a64b96b4c (diff) | |
| parent | 2a054d29dcfd4b68ed3914886b637f93ac7a0a72 (diff) | |
| download | guix-5c3cb22c9b2810669999e044b2de5e9331011a83.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/bioinformatics.scm gnu/packages/chez.scm gnu/packages/docbook.scm gnu/packages/ebook.scm gnu/packages/gnome.scm gnu/packages/linux.scm gnu/packages/networking.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/tex.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/dune.scm guix/build-system/go.scm guix/build-system/linux-module.scm guix/packages.scm
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 36b9c3ba54..56f60278b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -371,6 +371,10 @@ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/guix.vim \ + gnu/packages/aux-files/linux-libre/5.14-arm.conf \ + gnu/packages/aux-files/linux-libre/5.14-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.14-i686.conf \ + gnu/packages/aux-files/linux-libre/5.14-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.13-arm.conf \ gnu/packages/aux-files/linux-libre/5.13-arm64.conf \ gnu/packages/aux-files/linux-libre/5.13-i686.conf \ @@ -624,9 +628,11 @@ EXTRA_DIST += \ .guix-authorizations \ .guix-channel \ scripts/guix.in \ + etc/disarchive-manifest.scm \ etc/guix-install.sh \ etc/news.scm \ etc/release-manifest.scm \ + etc/source-manifest.scm \ etc/system-tests.scm \ etc/historical-authorizations \ build-aux/build-self.scm \ |