guix/gnu/build
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
..
accounts.scm
activation.scm
bootloader.scm
chromium-extension.scm
cross-toolchain.scm
file-systems.scm file-systems: Rewrite comment. 2021-05-04 15:40:32 +02:00
hurd-boot.scm
image.scm image: Fix spelling of "evaluate" 2021-04-21 08:30:32 -07:00
install.scm
linux-boot.scm gnu: Respect ‘rootdelay’ kernel command-line argument. 2021-06-16 12:13:40 +02:00
linux-container.scm
linux-initrd.scm
linux-modules.scm
locale.scm
marionette.scm
secret-service.scm
shepherd.scm
svg.scm
vm.scm