Merge branch 'master' into core-updates

Conflicts:
	etc/news.scm
	gnu/local.mk
	gnu/packages/check.scm
	gnu/packages/cross-base.scm
	gnu/packages/gimp.scm
	gnu/packages/java.scm
	gnu/packages/mail.scm
	gnu/packages/sdl.scm
	gnu/packages/texinfo.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
This commit is contained in:
Marius Bakke 2020-04-08 13:00:50 +02:00
commit 2778302399
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
172 changed files with 12138 additions and 1668 deletions

View file

@ -132,7 +132,6 @@ SYSTEM."
(define %cross-targets
'("mips64el-linux-gnu"
"mips64el-linux-gnuabi64"
"arm-linux-gnueabihf"
"aarch64-linux-gnu"
"powerpc-linux-gnu"