Marius Bakke 93006e5507 gnu: Adjust merge resolution. ... Commit 276f40fdc3 added unnecessary changes to these variables. * gnu/packages/openstack.scm (python-os-testr)[propagated-inputs]: Remove everything except PYTHON-STESTR. [native-inputs]: Add PYTHON-BABEL, PYTHON-TESTREPOSITORY and PYTHON-TESTTOOLS. * gnu/packages/python-xyz.scm (python-platformdirs)[arguments]: Remove obsolete phase. Run pytest verbosely. [native-inputs]: Remove PYTHON-PYTEST-COV.		2022-01-18 19:35:54 +01:00
..
bootloader
build
home
installer
machine	machine: ssh: Add 'safety-checks?' field.	2022-01-16 23:56:55 +01:00
packages	gnu: Adjust merge resolution.	2022-01-18 19:35:54 +01:00
platforms
services	daemon: Always default to gzip for log compression.	2022-01-18 18:46:51 +01:00
system
tests
artwork.scm
bootloader.scm
ci.scm
home.scm
image.scm
installer.scm
local.mk	gnu: gnome-control-center: Update to 41.2.	2022-01-18 12:33:22 -05:00
machine.scm
packages.scm
platform.scm
services.scm
system.scm
tests.scm