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	gnu: bootloader: Fix install-allwinner64-u-boot.	2021-05-29 21:25:13 -07:00
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	services: cuirass: Do not export record type descriptors.	2021-06-01 23:26:07 +02:00
system	Merge branch 'master' into core-updates	2021-05-22 17:21:57 +02:00
tests	tests: hpcguix-web: Fix it.	2021-06-01 14:33:27 +02:00
artwork.scm
bootloader.scm
ci.scm	ci: Add derivation inputs.	2021-05-25 14:47:16 +02:00
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	gnu: Allow services to install kernel-loadable modules.	2021-05-11 16:13:48 +02:00
system.scm	Merge branch 'version-1.3.0'	2021-05-11 22:42:59 -04:00
tests.scm