Merge remote-tracking branch 'origin/master' into core-updates

 Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm

1 files changed, 13 insertions, 0 deletions

diff --git a/gnu/packages/patches/kwayland-skip-flaky-test.patch b/gnu/packages/patches/kwayland-skip-flaky-test.patch
new file mode 100644
index 0000000000..592ab3cc77
--- /dev/null
+++ b/gnu/packages/patches/kwayland-skip-flaky-test.patch
@@ -0,0 +1,13 @@
+This test fails in the Guix CI for unknown and difficult to debug reasons.
+
+diff --git a/autotests/client/test_plasma_window_model.cpp b/autotests/client/test_plasma_window_model.cpp
+--- a/autotests/client/test_plasma_window_model.cpp
++++ b/autotests/client/test_plasma_window_model.cpp
+@@ -545,6 +545,7 @@ void PlasmaWindowModelTest::testPid()
+ 
+ void PlasmaWindowModelTest::testVirtualDesktops()
+ {
++    QSKIP("This test fails on the Guix CI (FIXME)");
+     auto model = m_pw->createWindowModel();
+     QVERIFY(model);
+     QSignalSpy rowInsertedSpy(model, &PlasmaWindowModel::rowsInserted);