Maxim Cournoyer 01f0707207 Merge branch 'staging' into 'core-updates'. ... Conflicts: gnu/local.mk gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/gl.scm gnu/packages/glib.scm gnu/packages/guile.scm gnu/packages/node.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/python-xyz.scm gnu/packages/python.scm gnu/packages/tls.scm gnu/packages/vpn.scm gnu/packages/xorg.scm		2021-01-13 23:45:53 -05:00
..
bootloader
build
installer
machine
packages	Merge branch 'staging' into 'core-updates'.	2021-01-13 23:45:53 -05:00
services
system	Merge branch 'staging' into 'core-updates'.	2021-01-13 23:45:53 -05:00
tests
artwork.scm
bootloader.scm
ci.scm
image.scm
installer.scm
local.mk
machine.scm
packages.scm
services.scm
system.scm
tests.scm