diff options
author | Marius Bakke <marius@gnu.org> | 2022-07-22 01:09:14 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2022-07-22 01:09:14 +0200 |
commit | 9044b086ddca64a62966a83cbf1b82d32dece89e (patch) | |
tree | 2c7f910c9100b2f2a752d07fe0ec44be83fb7600 /Makefile.am | |
parent | 5dfc6ab1ab292b87ceea144aa661d0e64c834031 (diff) | |
parent | abea091dbef2d44e6eb46bd2413bdf917e14d095 (diff) | |
download | guix-9044b086ddca64a62966a83cbf1b82d32dece89e.tar guix-9044b086ddca64a62966a83cbf1b82d32dece89e.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 254968244c..8b3d7a13f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -396,10 +396,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.17-arm.conf \ - gnu/packages/aux-files/linux-libre/5.17-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.17-i686.conf \ - gnu/packages/aux-files/linux-libre/5.17-x86_64.conf \ + gnu/packages/aux-files/linux-libre/5.18-arm.conf \ + gnu/packages/aux-files/linux-libre/5.18-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.18-i686.conf \ + gnu/packages/aux-files/linux-libre/5.18-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.15-arm.conf \ gnu/packages/aux-files/linux-libre/5.15-arm64.conf \ gnu/packages/aux-files/linux-libre/5.15-i686.conf \ @@ -668,6 +668,7 @@ EXTRA_DIST += \ etc/release-manifest.scm \ etc/source-manifest.scm \ etc/system-tests.scm \ + etc/time-travel-manifest.scm \ etc/historical-authorizations \ build-aux/build-self.scm \ build-aux/compile-all.scm \ |