[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into staging |
|
Date: |
Wed, 12 Oct 2022 13:48:47 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit 322917aeb8e672c21378fd371a5cff4a9f0c2520
Merge: 407f017663 e1baf802cc
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Oct 12 14:33:56 2022 +0300
Merge remote-tracking branch 'origin/master' into staging
Conflicts:
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/kde-frameworks.scm
gnu/packages/video.scm
NEWS | 1 +
doc/contributing.texi | 25 +-
doc/guix.texi | 420 +-
etc/guix-install.sh | 66 +-
etc/news.scm | 42 +
etc/snippets/tempel/text-mode | 253 +-
etc/teams.scm.in | 3 +-
gnu/build/marionette.scm | 53 +-
gnu/ci.scm | 1 +
gnu/home/services/pm.scm | 145 +
gnu/local.mk | 13 +-
gnu/packages/admin.scm | 71 +
gnu/packages/algebra.scm | 169 +-
gnu/packages/astronomy.scm | 44 +
gnu/packages/audio.scm | 11 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bash.scm | 3 +-
gnu/packages/bioconductor.scm | 198 +-
gnu/packages/bioinformatics.scm | 457 +-
gnu/packages/build-tools.scm | 33 +
gnu/packages/chromium.scm | 6 +-
gnu/packages/cran.scm | 51 +
gnu/packages/crates-io.scm | 261 +-
gnu/packages/dbm.scm | 7 +-
gnu/packages/education.scm | 41 +-
gnu/packages/emacs-xyz.scm | 490 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/file-systems.scm | 12 +-
gnu/packages/finance.scm | 8 +-
gnu/packages/fonts.scm | 65 +
gnu/packages/fpga.scm | 25 +-
gnu/packages/freedesktop.scm | 113 +-
gnu/packages/game-development.scm | 8 +-
gnu/packages/games.scm | 77 +-
gnu/packages/gcc.scm | 1 -
gnu/packages/geo.scm | 34 +-
gnu/packages/gnome.scm | 174 +-
gnu/packages/gnuzilla.scm | 431 +-
gnu/packages/golang.scm | 166 +-
gnu/packages/graph.scm | 1 +
gnu/packages/graphics.scm | 198 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile-xyz.scm | 19 +-
gnu/packages/hardware.scm | 28 +-
gnu/packages/haskell-web.scm | 21 +
gnu/packages/haskell.scm | 36 +
gnu/packages/high-availability.scm | 242 +
gnu/packages/ibus.scm | 17 +-
gnu/packages/kde-frameworks.scm | 4 +-
gnu/packages/kde-plasma.scm | 6 +-
gnu/packages/kde-systemtools.scm | 2 +-
gnu/packages/kde.scm | 29 +-
gnu/packages/language.scm | 29 +
gnu/packages/libdaemon.scm | 7 +-
gnu/packages/libreoffice.scm | 254 +-
gnu/packages/linux.scm | 32 +-
gnu/packages/mail.scm | 67 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/matrix.scm | 15 +-
gnu/packages/mes.scm | 4 +-
gnu/packages/messaging.scm | 36 +-
gnu/packages/multiprecision.scm | 73 +-
gnu/packages/music.scm | 51 +-
gnu/packages/networking.scm | 59 +-
gnu/packages/ocaml.scm | 63 +-
gnu/packages/package-management.scm | 12 +-
gnu/packages/password-utils.scm | 51 +-
gnu/packages/patches/giac-pari-gp-anyarg.patch | 28 +
.../icecat-use-older-reveal-hidden-html.patch | 70 -
.../patches/picard-fix-id3-rename-test.patch | 11 -
.../patches/public-inbox-fix-spawn-test.patch | 43 -
gnu/packages/patches/python-louvain-fix-test.patch | 15 +
.../patches/scotch-build-parallelism.patch | 39 -
.../patches/scotch-integer-declarations.patch | 37 -
gnu/packages/patches/sssd-optional-systemd.patch | 24 +-
gnu/packages/pdf.scm | 70 +-
gnu/packages/perl.scm | 22 +
gnu/packages/python-crypto.scm | 34 +-
gnu/packages/python-web.scm | 88 +-
gnu/packages/python-xyz.scm | 201 +-
gnu/packages/qt.scm | 54 +-
gnu/packages/radio.scm | 43 +-
gnu/packages/ratpoison.scm | 66 +-
gnu/packages/sdl.scm | 16 +-
gnu/packages/selinux.scm | 13 +-
gnu/packages/sssd.scm | 4 +-
gnu/packages/statistics.scm | 72 +-
gnu/packages/syndication.scm | 114 +-
gnu/packages/telegram.scm | 2 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 116 +
gnu/packages/text-editors.scm | 40 +
gnu/packages/version-control.scm | 236 +-
gnu/packages/video.scm | 20 +-
gnu/packages/vim.scm | 12 +-
gnu/packages/vnc.scm | 240 +-
gnu/packages/web.scm | 28 +
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 29 +
gnu/packages/xdisorg.scm | 31 +-
gnu/packages/xml.scm | 4 +-
gnu/packages/xorg.scm | 4 +-
gnu/services/base.scm | 109 +
gnu/services/certbot.scm | 2 +
gnu/services/guix.scm | 9 +
gnu/services/networking.scm | 123 +-
gnu/services/shepherd.scm | 13 +-
gnu/services/vnc.scm | 247 +
gnu/services/web.scm | 60 +-
gnu/services/xorg.scm | 205 +-
gnu/system.scm | 3 +-
gnu/tests/base.scm | 25 +-
gnu/tests/install.scm | 2 +
gnu/tests/vnc.scm | 203 +
guix/channels.scm | 29 +-
guix/git.scm | 10 +-
guix/gnu-maintenance.scm | 3 +-
guix/import/print.scm | 3 +-
guix/import/utils.scm | 75 +-
guix/inferior.scm | 4 +-
guix/licenses.scm | 58 +-
guix/packages.scm | 40 +-
guix/read-print.scm | 2 +-
guix/scripts/build.scm | 10 +-
guix/scripts/deploy.scm | 2 +-
guix/scripts/import.scm | 4 +-
guix/scripts/system.scm | 6 +
guix/transformations.scm | 78 +-
nix/libstore/gc.cc | 9 +-
po/doc/guix-cookbook.de.po | 18 +-
po/doc/guix-manual.de.po | 29495 ++++---
po/doc/guix-manual.es.po | 28061 +++---
po/doc/guix-manual.fr.po | 85971 ++++++-------------
po/doc/guix-manual.pt_BR.po | 27926 +++---
po/doc/guix-manual.ru.po | 28035 +++---
po/doc/guix-manual.zh_CN.po | 55102 +++++-------
po/guix/POTFILES.in | 1 +
po/guix/bn.po | 576 +-
po/guix/cs.po | 585 +-
po/guix/da.po | 596 +-
po/guix/de.po | 702 +-
po/guix/eo.po | 585 +-
po/guix/fa.po | 577 +-
po/guix/fi.po | 575 +-
po/guix/fr.po | 623 +-
po/guix/hu.po | 585 +-
po/guix/ja.po | 575 +-
po/guix/ko.po | 576 +-
po/guix/nl.po | 623 +-
po/guix/oc.po | 575 +-
po/guix/pl.po | 1013 +-
po/guix/pt_BR.po | 607 +-
po/guix/ru.po | 660 +-
po/guix/si.po | 575 +-
po/guix/sk.po | 616 +-
po/guix/sr.po | 585 +-
po/guix/sv.po | 612 +-
po/guix/ta.po | 598 +-
po/guix/tr.po | 576 +-
po/guix/uk.po | 763 +-
po/guix/vi.po | 585 +-
po/guix/zh_CN.po | 579 +-
po/packages/da.po | 2740 +-
po/packages/de.po | 2735 +-
po/packages/eo.po | 2735 +-
po/packages/es.po | 2761 +-
po/packages/fa.po | 2735 +-
po/packages/fi.po | 2735 +-
po/packages/fr.po | 2740 +-
po/packages/hu.po | 2735 +-
po/packages/it.po | 2735 +-
po/packages/ko.po | 2735 +-
po/packages/nl.po | 2735 +-
po/packages/oc.po | 2735 +-
po/packages/pl.po | 2758 +-
po/packages/pt_BR.po | 2735 +-
po/packages/sk.po | 2735 +-
po/packages/sr.po | 2735 +-
po/packages/tr.po | 2735 +-
po/packages/zh_CN.po | 2735 +-
tests/guix-system.sh | 6 +
tests/import-utils.scm | 38 +-
tests/packages.scm | 7 +
tests/print.scm | 23 +
tests/transformations.scm | 32 +-
185 files changed, 147854 insertions(+), 180191 deletions(-)
diff --cc gnu/packages/kde-frameworks.scm
index 87c9884284,059667ee5d..20b30066a2
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -730,7 -734,7 +730,7 @@@ replace the other outdated Graphviz too
(native-inputs
(list extra-cmake-modules pkg-config))
(inputs
- (list qtbase-5 qtwayland qtx11extras plasma-wayland-protocols wayland))
- (list qtbase-5 qtx11extras))
++ (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland))
(home-page "https://community.kde.org/Frameworks";)
(synopsis "Utilities for graphical user interfaces")
(description "The KDE GUI addons provide utilities for graphical user
@@@ -1051,21 -1068,16 +1051,21 @@@ protocols used in KDE Plasma."
(native-inputs
(list extra-cmake-modules pkg-config))
(inputs
- (list qtbase-5 plasma-wayland-protocols qtwayland wayland
wayland-protocols))
- (list qtbase-5 qtwayland-5 wayland wayland-protocols))
++ (list qtbase-5 plasma-wayland-protocols qtwayland-5 wayland
wayland-protocols))
(arguments
- `(#:tests? #f ; FIXME tests require weston to run
- ; weston requires wayland flags in mesa
- #:phases
+ `(#:phases
(modify-phases %standard-phases
- (add-before 'check 'check-setup
+ (add-after 'unpack 'skip-specific-tests
(lambda _
- (setenv "XDG_RUNTIME_DIR" "/tmp")
- #t)))))
+ ;; PlasmaWindowModelTest::testChangeWindowAfterModelDestroy(icon)
+ (substitute* "autotests/client/test_plasma_window_model.cpp"
+ ((".*changedSpy\\.wait.*") ""))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (when tests? ;; One test fails.
+ (invoke "ctest" "-E" "kwayland-testWaylandRegistry")))))))
(home-page "https://community.kde.org/Frameworks";)
(synopsis "Qt-style API to interact with the wayland client and server")
(description "As the names suggest they implement a Client respectively a
diff --cc gnu/packages/kde-plasma.scm
index 634a44eecf,064f5f7278..2b88ea2afe
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@@ -269,8 -265,7 +269,8 @@@ call it if it is not associated to a te
;; For testing.
dbus))
(inputs
- (list kwayland libxrandr qtbase-5 qtx11extras))
+ (list kwayland libxrandr plasma-wayland-protocols
- qtbase-5 qtwayland wayland qtx11extras))
++ qtbase-5 qtwayland-5 wayland qtx11extras))
(arguments
'(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
(home-page "https://community.kde.org/Solid/Projects/ScreenManagement";)
@@@ -337,52 -335,3 +337,52 @@@ manage running processes. It obtains t
with a ksysguardd daemon, which may also run on a remote system.")
(license license:gpl3+)))
+(define-public kwayland-server
+ (package
+ (name "kwayland-server")
+ (version "5.24.4")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "mirror://kde/stable/plasma/" version
+ "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"))))
+ (build-system qt-build-system)
+ (native-inputs
+ (list extra-cmake-modules pkg-config))
+ (inputs
+ (list plasma-wayland-protocols
+ qtbase-5
- qtwayland
++ qtwayland-5
+ kwayland
+ wayland
+ wayland-protocols-next))
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-install-path
+ (lambda _
+ ;; Fixes errors including nonexistant /include/KF5
+ (substitute* "src/server/CMakeLists.txt"
+ (("KF5_INSTALL") "KDE_INSTALL"))))
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" (getcwd))
+ (setenv "XDG_RUNTIME_DIR" (getcwd))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (invoke "ctest" "-E"
+ ;; This test fails inconsistently.
+ "kwayland-testDragAndDrop")))))))
+ (home-page "https://api.kde.org/kwayland-server/html/index.html";)
+ (synopsis "KDE wayland server component")
+ (description
+ "KWayland is a Qt-style API to interact with the wayland-client and
+wayland-server API.")
+ ;; Most files are LGPL2.1 or LGPL3.0 only, at the users option.
+ (license (list license:lgpl2.1 license:lgpl3
+ ;; src/server/drm_fourcc.h carries the MIT license.
+ license:expat))))
+
diff --cc gnu/packages/kde-systemtools.scm
index 5515c58d49,4e6cd1d6e1..96ed5cb777
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@@ -269,16 -253,13 +269,16 @@@ This package is part of the KDE base ap
libvnc
libxcb
libxtst
- oxygen-icons ;; default icon set
+ breeze-icons ;; default icon set
pipewire-0.3
+ plasma-wayland-protocols
qtbase-5
- qtwayland
++ qtwayland-5
qtx11extras
+ wayland
xcb-util-image
zlib))
- (home-page "https://kde.org/applications/internet/org.kde.krfb";)
+ (home-page "https://apps.kde.org/krfb/";)
(synopsis "Desktop Sharing utility")
(description "KDE Desktop Sharing is a server application that allows you
to share your current session with a user on another machine. The desktop
diff --cc gnu/packages/kde.scm
index e83470bc53,20df62fdfa..1d4321237a
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@@ -750,9 -748,7 +750,9 @@@ different notification systems."
qtmultimedia-5
qtquickcontrols-5
qtquickcontrols2-5
- qtx11extras))
+ qtx11extras
- qtwayland
++ qtwayland-5
+ wayland))
(home-page "https://community.kde.org/KDEConnect";)
(synopsis "Enable your devices to communicate with each other")
(description "KDE Connect is a project that enables all your devices to
diff --cc gnu/packages/qt.scm
index 64db8ea67c,6e30980505..134215ebeb
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -1448,10 -1450,10 +1448,10 @@@ record media, and manage a collection o
set of plugins for interacting with pulseaudio and GStreamer.")
(license (package-license qtbase))))
- (define-public qtwayland
+ (define-public qtwayland-5
(package (inherit qtsvg-5)
(name "qtwayland")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt-urls name version))