Marius Bakke f034264204 Merge branch 'master' into core-updates ... Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm		2021-05-09 21:29:46 +02:00
..
bootloader	bootloader: grub: Fix typo in docstring.	2021-04-10 14:11:33 +02:00
build	Merge branch 'master' into core-updates	2021-05-09 21:29:46 +02:00
installer	tests: Add gui-uefi-installed-os test.	2021-04-28 15:51:12 +02:00
machine
packages	Merge branch 'master' into core-updates	2021-05-09 21:29:46 +02:00
services	services: configuration: Export 'no-serialization' syntactic keyword.	2021-05-08 15:06:31 +02:00
system	Merge remote-tracking branch 'origin/master' into core-updates	2021-04-16 14:39:48 +03:00
tests	tests: Add gui-uefi-installed-os test.	2021-04-28 15:51:12 +02:00
artwork.scm
bootloader.scm
ci.scm	ci: Add custom subset.	2021-04-28 11:53:33 +02:00
image.scm
installer.scm
local.mk	Merge branch 'master' into core-updates	2021-05-09 21:29:46 +02:00
machine.scm
packages.scm
services.scm	services: Support DELETE in MODIFY-SERVICES macro.	2021-04-12 17:49:07 +02:00
system.scm
tests.scm	tests: Support package extensions in the backdoor REPL.	2021-04-12 18:42:22 +02:00