Marius Bakke 8d59c262ad Merge branch 'master' into core-updates ... Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm		2021-06-06 21:16:32 +02:00
..
bootloader
build	Merge branch 'master' into core-updates	2021-06-06 21:16:32 +02:00
installer
machine	machine: ssh: Respect calling convention for monadic procedures.	2021-06-03 13:04:20 +02:00
packages	Merge branch 'master' into core-updates	2021-06-06 21:16:32 +02:00
services
system
tests
artwork.scm
bootloader.scm
ci.scm
image.scm
installer.scm
local.mk	Merge branch 'master' into core-updates	2021-06-06 21:16:32 +02:00
machine.scm
packages.scm
services.scm
system.scm
tests.scm