diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /Makefile.am | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 2fef3b05ab..8c06125f93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -371,10 +371,6 @@ AUX_FILES = \ gnu/packages/aux-files/linux-libre/5.13-arm64.conf \ gnu/packages/aux-files/linux-libre/5.13-i686.conf \ gnu/packages/aux-files/linux-libre/5.13-x86_64.conf \ - gnu/packages/aux-files/linux-libre/5.12-arm.conf \ - gnu/packages/aux-files/linux-libre/5.12-arm64.conf \ - gnu/packages/aux-files/linux-libre/5.12-i686.conf \ - gnu/packages/aux-files/linux-libre/5.12-x86_64.conf \ 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 \ |