Marius Bakke 6f9a80b331 Merge branch 'master' into core-updates ... Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a277 and 12964df69a respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm		2021-06-19 17:38:47 +02:00
..
bootloader
build	Merge branch 'master' into core-updates	2021-06-19 17:38:47 +02:00
installer	installer: Improve the installation device detection method.	2021-06-17 11:00:26 +02:00
machine
packages	Merge branch 'master' into core-updates	2021-06-19 17:38:47 +02:00
services	services: guix: Authorize 'bordeaux.guix.gnu.org.pub' by default.	2021-06-19 09:32:54 +01:00
system
tests
artwork.scm
bootloader.scm
ci.scm
image.scm
installer.scm
local.mk	Merge branch 'master' into core-updates	2021-06-19 17:38:47 +02:00
machine.scm
packages.scm
services.scm
system.scm
tests.scm