Marius Bakke 6f9a80b331
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b 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
..
2021-03-06 11:41:48 +01:00
2020-07-05 03:15:08 +05:30
2021-01-04 23:54:16 +01:00
2020-07-05 16:07:59 +05:30
2020-12-09 22:25:17 +01:00
2021-01-04 23:54:16 +01:00
2021-01-04 23:54:16 +01:00
2021-04-12 18:42:22 +02:00
2020-12-19 23:25:01 +01:00
2021-05-11 12:49:53 +02:00
2021-06-14 18:35:18 +02:00