[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'master' into staging |
|
Date: |
Thu, 11 Aug 2022 16:53:10 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit b50eaa67642ebc25e9c896f2e700c08610e0a5da
Merge: 7b69cd0740 99b73f6041
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Aug 11 22:15:22 2022 +0200
Merge branch 'master' into staging
.guix-authorizations | 3 +-
Makefile.am | 21 +-
doc/guix.texi | 450 +-
doc/htmlxref.cnf | 4 +-
etc/disarchive-manifest.scm | 21 +-
etc/news.scm | 33 +-
etc/system-tests.scm | 3 +-
etc/teams.scm.in | 9 +
gnu/artwork.scm | 4 +-
gnu/build/file-systems.scm | 6 +
gnu/build/marionette.scm | 9 +-
gnu/ci.scm | 43 +-
gnu/home.scm | 26 +-
gnu/home/services.scm | 14 +-
gnu/home/services/ssh.scm | 8 +-
gnu/home/services/xdg.scm | 25 +-
gnu/installer.scm | 3 +-
gnu/installer/parted.scm | 22 +-
gnu/installer/services.scm | 39 +-
gnu/installer/steps.scm | 32 +-
gnu/installer/user.scm | 7 +-
gnu/local.mk | 34 +-
gnu/packages/admin.scm | 283 +-
gnu/packages/algebra.scm | 73 +-
gnu/packages/android.scm | 30 +
gnu/packages/animation.scm | 8 +-
gnu/packages/aspell.scm | 11 +
gnu/packages/astronomy.scm | 229 +-
gnu/packages/audio.scm | 38 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 2 +-
gnu/packages/backup.scm | 28 +-
gnu/packages/benchmark.scm | 2 +-
gnu/packages/bioconductor.scm | 187 +-
gnu/packages/bioinformatics.scm | 295 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/boost.scm | 8 +-
gnu/packages/bootloaders.scm | 21 +-
gnu/packages/c.scm | 22 +-
gnu/packages/check.scm | 11 +-
gnu/packages/chromium.scm | 14 +-
gnu/packages/code.scm | 5 +-
gnu/packages/compression.scm | 78 +-
gnu/packages/connman.scm | 2 +-
gnu/packages/cpp.scm | 8 +-
gnu/packages/cran.scm | 844 +-
gnu/packages/crates-io.scm | 29 +-
gnu/packages/crypto.scm | 6 +-
gnu/packages/databases.scm | 37 +-
gnu/packages/datastructures.scm | 26 +-
gnu/packages/diffoscope.scm | 8 +-
gnu/packages/disk.scm | 18 +-
gnu/packages/display-managers.scm | 244 +-
gnu/packages/django.scm | 8 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/documentation.scm | 10 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/education.scm | 46 +-
gnu/packages/electronics.scm | 4 +-
gnu/packages/elf.scm | 9 +-
gnu/packages/emacs-xyz.scm | 73 +-
gnu/packages/emacs.scm | 5 +
gnu/packages/emulators.scm | 8 +-
gnu/packages/engineering.scm | 66 +-
gnu/packages/fcitx5.scm | 6 +-
gnu/packages/finance.scm | 224 +-
gnu/packages/fonts.scm | 92 +-
gnu/packages/freedesktop.scm | 133 +-
gnu/packages/game-development.scm | 26 +-
gnu/packages/games.scm | 334 +-
gnu/packages/gdb.scm | 12 +
gnu/packages/geo.scm | 20 +-
gnu/packages/gnome-xyz.scm | 12 +-
gnu/packages/gnome.scm | 160 +-
gnu/packages/gnupg.scm | 10 +
gnu/packages/gnuzilla.scm | 8 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/graphics.scm | 130 +-
gnu/packages/graphviz.scm | 3 +-
gnu/packages/gsasl.scm | 10 +-
gnu/packages/guile-xyz.scm | 68 +-
gnu/packages/guile.scm | 4 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haxe.scm | 284 +
gnu/packages/hunspell.scm | 2 +-
gnu/packages/image-processing.scm | 13 +-
gnu/packages/image-viewers.scm | 20 +-
gnu/packages/image.scm | 181 +-
gnu/packages/inkscape.scm | 15 +-
gnu/packages/installers.scm | 9 +-
gnu/packages/instrumentation.scm | 58 +
gnu/packages/irc.scm | 6 +-
gnu/packages/jami.scm | 235 +-
gnu/packages/kde-frameworks.scm | 124 +-
gnu/packages/kde-internet.scm | 2 +-
gnu/packages/kde-multimedia.scm | 28 +-
gnu/packages/kde-pim.scm | 54 +-
gnu/packages/kde-plasma.scm | 6 +-
gnu/packages/kde-systemtools.scm | 2 +-
gnu/packages/kde-utils.scm | 4 +-
gnu/packages/kde.scm | 82 +-
gnu/packages/kerberos.scm | 31 +-
gnu/packages/lego.scm | 2 +-
gnu/packages/libreoffice.scm | 442 +-
gnu/packages/libunwind.scm | 4 +-
gnu/packages/linphone.scm | 10 +-
gnu/packages/linux.scm | 397 +-
gnu/packages/lisp-check.scm | 8 +-
gnu/packages/lisp-xyz.scm | 385 +-
gnu/packages/llvm.scm | 166 +-
gnu/packages/logging.scm | 9 +-
gnu/packages/lxqt.scm | 92 +-
gnu/packages/machine-learning.scm | 9 +-
gnu/packages/mail.scm | 168 +-
gnu/packages/maths.scm | 559 +-
gnu/packages/messaging.scm | 104 +-
gnu/packages/mingw.scm | 9 +-
gnu/packages/monitoring.scm | 19 +
gnu/packages/mp3.scm | 105 +-
gnu/packages/mpd.scm | 12 +-
gnu/packages/mtools.scm | 6 +-
gnu/packages/music.scm | 72 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 236 +-
gnu/packages/nim.scm | 110 +-
gnu/packages/node.scm | 4 +-
gnu/packages/notcurses.scm | 89 +-
gnu/packages/ocaml.scm | 136 +-
gnu/packages/onc-rpc.scm | 12 +-
gnu/packages/openstack.scm | 402 +-
gnu/packages/orange.scm | 4 +-
gnu/packages/package-management.scm | 97 +-
gnu/packages/parallel.scm | 7 +-
gnu/packages/password-utils.scm | 8 +-
.../aoflagger-use-system-provided-pybind11.patch | 38 +
gnu/packages/patches/aspell-CVE-2019-25051.patch | 99 +
gnu/packages/patches/barony-fix-textures.patch | 237 +
.../patches/fail2ban-0.11.2_CVE-2021-32749.patch | 155 +
.../fail2ban-0.11.2_fix-setuptools-drop-2to3.patch | 64 +
.../patches/fail2ban-0.11.2_fix-test-suite.patch | 48 +
.../patches/fail2ban-paths-guix-conf.patch | 32 +
.../patches/fail2ban-python310-server-action.patch | 27 +
.../fail2ban-python310-server-actions.patch | 25 +
.../patches/fail2ban-python310-server-jails.patch | 25 +
gnu/packages/patches/fuse-glibc-2.34.patch | 49 +
gnu/packages/patches/gnupg-CVE-2022-34903.patch | 54 +
gnu/packages/patches/jami-fix-crash-on-quit.patch | 34 -
gnu/packages/patches/jami-fix-esc-bug.patch | 24 +
gnu/packages/patches/jami-images-loading.patch | 152 -
.../patches/jami-libclient-audio-managers.patch | 23 -
gnu/packages/patches/jami-memory-usage.patch | 70 -
.../libphonenumber-reproducible-build.patch | 25 +
gnu/packages/patches/libtirpc-CVE-2021-46828.patch | 567 +
.../patches/libvirt-add-install-prefix.patch | 268 +-
gnu/packages/patches/mumps-build-parallelism.patch | 13 -
gnu/packages/patches/mumps-shared-libseq.patch | 42 -
gnu/packages/patches/mumps-shared-mumps.patch | 63 -
gnu/packages/patches/mumps-shared-pord.patch | 77 -
gnu/packages/patches/nsis-env-passthru.patch | 17 +-
gnu/packages/patches/nsis-source-date-epoch.patch | 23 -
gnu/packages/patches/qtwayland-gcc-11.patch | 18 +
.../ruby-anystyle-data-immutable-install.patch | 40 +
.../ruby-anystyle-fix-dictionary-populate.patch | 94 +
.../patches/ruby-latex-decode-fix-test.patch | 66 +
.../patches/shishi-fix-libgcrypt-detection.patch | 32 -
.../unzip-CVE-2022-0529+CVE-2022-0530.patch | 177 +
gnu/packages/patches/xygrib-fix-finding-data.patch | 2 +-
gnu/packages/pdf.scm | 2 +-
gnu/packages/photo.scm | 60 +-
gnu/packages/printers.scm | 2 +-
gnu/packages/pulseaudio.scm | 29 +-
gnu/packages/python-check.scm | 4 +-
gnu/packages/python-science.scm | 47 +-
gnu/packages/python-web.scm | 97 +-
gnu/packages/python-xyz.scm | 464 +-
gnu/packages/python.scm | 8 +-
gnu/packages/qt.scm | 1281 +-
gnu/packages/radio.scm | 38 +-
gnu/packages/robotics.scm | 4 +-
gnu/packages/rpm.scm | 124 +-
gnu/packages/ruby.scm | 753 +
gnu/packages/sagemath.scm | 21 +-
gnu/packages/scribus.scm | 4 +-
gnu/packages/search.scm | 41 +-
gnu/packages/security-token.scm | 87 +-
gnu/packages/serialization.scm | 72 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/simulation.scm | 16 +-
gnu/packages/slang.scm | 49 +-
gnu/packages/statistics.scm | 110 +-
gnu/packages/suckless.scm | 39 +-
gnu/packages/sync.scm | 16 +-
gnu/packages/synergy.scm | 2 +-
gnu/packages/task-management.scm | 35 +-
gnu/packages/telegram.scm | 4 +-
gnu/packages/telephony.scm | 12 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 453 +-
gnu/packages/text-editors.scm | 20 +-
gnu/packages/tls.scm | 84 +-
gnu/packages/tor.scm | 10 +-
gnu/packages/tryton.scm | 1010 +-
gnu/packages/version-control.scm | 9 +-
gnu/packages/video.scm | 216 +-
gnu/packages/virtualization.scm | 160 +-
gnu/packages/vpn.scm | 29 +-
gnu/packages/web-browsers.scm | 49 +-
gnu/packages/web.scm | 20 +-
gnu/packages/wm.scm | 50 +-
gnu/packages/xdisorg.scm | 89 +-
gnu/packages/xfce.scm | 8 +-
gnu/packages/xorg.scm | 72 +-
gnu/services/admin.scm | 21 +-
gnu/services/configuration.scm | 11 +-
gnu/services/cuirass.scm | 5 +-
gnu/services/desktop.scm | 8 +-
gnu/services/file-sharing.scm | 4 +-
gnu/services/mail.scm | 45 +-
gnu/services/messaging.scm | 12 +-
gnu/services/networking.scm | 17 +-
gnu/services/telephony.scm | 6 +-
gnu/services/virtualization.scm | 12 +-
gnu/system/examples/vm-image.tmpl | 13 +-
gnu/system/file-systems.scm | 4 +-
gnu/system/install.scm | 17 +-
gnu/system/linux-container.scm | 97 +-
gnu/tests/install.scm | 15 +-
gnu/tests/telephony.scm | 53 +-
gnu/tests/virtualization.scm | 84 +
guix/build-system/asdf.scm | 18 +-
guix/build-system/channel.scm | 78 +
guix/build-system/perl.scm | 122 +-
guix/build-system/qt.scm | 14 +
guix/build/asdf-build-system.scm | 33 +-
guix/build/download.scm | 103 +-
guix/build/lisp-utils.scm | 46 +-
guix/build/qt-utils.scm | 48 +-
guix/build/syscalls.scm | 3 +
guix/channels.scm | 27 +-
guix/lint.scm | 4 +-
guix/read-print.scm | 696 +
guix/scripts/build.scm | 29 +-
guix/scripts/describe.scm | 40 +-
guix/scripts/environment.scm | 27 +-
guix/scripts/gc.scm | 6 +-
guix/scripts/import.scm | 4 +-
guix/scripts/lint.scm | 22 +-
guix/scripts/style.scm | 527 +-
guix/scripts/system.scm | 5 -
guix/self.scm | 1 +
guix/ssh.scm | 4 +
guix/tests/git.scm | 1 +
guix/utils.scm | 12 +
po/doc/guix-cookbook.de.po | 37 +-
po/doc/guix-cookbook.sk.po | 6 +-
po/doc/guix-manual.de.po | 27978 +++---
po/doc/guix-manual.es.po | 27480 +++---
po/doc/guix-manual.fr.po | 85675 ++++++-------------
po/doc/guix-manual.pt_BR.po | 27141 +++---
po/doc/guix-manual.ru.po | 27215 +++---
po/doc/guix-manual.zh_CN.po | 27108 +++---
po/guix/LINGUAS | 1 +
po/guix/POTFILES.in | 1 +
po/guix/{ja.po => bn.po} | 1107 +-
po/guix/cs.po | 1046 +-
po/guix/da.po | 1090 +-
po/guix/de.po | 1183 +-
po/guix/eo.po | 1095 +-
po/guix/es.po | 1119 +-
po/guix/fa.po | 1036 +-
po/guix/fi.po | 1036 +-
po/guix/fr.po | 1111 +-
po/guix/hu.po | 1079 +-
po/guix/it.po | 1164 +-
po/guix/ja.po | 1035 +-
po/guix/ko.po | 1057 +-
po/guix/nl.po | 1117 +-
po/guix/oc.po | 1038 +-
po/guix/pl.po | 1045 +-
po/guix/pt_BR.po | 1120 +-
po/guix/ru.po | 1063 +-
po/guix/si.po | 1036 +-
po/guix/sk.po | 1242 +-
po/guix/sr.po | 1078 +-
po/guix/sv.po | 1083 +-
po/guix/ta.po | 1093 +-
po/guix/tr.po | 1036 +-
po/guix/uk.po | 1209 +-
po/guix/vi.po | 1082 +-
po/guix/zh_CN.po | 2226 +-
po/packages/da.po | 3352 +-
po/packages/de.po | 3352 +-
po/packages/eo.po | 3352 +-
po/packages/es.po | 3352 +-
po/packages/fa.po | 3352 +-
po/packages/fi.po | 3352 +-
po/packages/fr.po | 3509 +-
po/packages/hu.po | 3352 +-
po/packages/it.po | 3352 +-
po/packages/ko.po | 3352 +-
po/packages/nl.po | 3352 +-
po/packages/oc.po | 3352 +-
po/packages/pl.po | 3352 +-
po/packages/pt_BR.po | 3352 +-
po/packages/sk.po | 3352 +-
po/packages/sr.po | 3352 +-
po/packages/tr.po | 3352 +-
po/packages/zh_CN.po | 3352 +-
tests/guix-home.sh | 5 +-
tests/guix-style.sh | 80 +
tests/read-print.scm | 380 +
tests/services/configuration.scm | 26 +-
tests/style.scm | 185 +-
312 files changed, 159827 insertions(+), 175019 deletions(-)
diff --cc gnu/local.mk
index 872437cb42,1bd791fb0c..0ee0a4d8b6
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1078,8 -1090,10 +1090,9 @@@ dist_patch_DATA =
%D%/packages/patches/fp16-system-libraries.patch \
%D%/packages/patches/fpc-reproducibility.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
- %D%/packages/patches/freeglut-gcc-compat.patch \
%D%/packages/patches/freeimage-unbundle.patch \
- %D%/packages/patches/fuse-overlapping-headers.patch
\
+ %D%/packages/patches/fuse-glibc-2.34.patch \
+ %D%/packages/patches/fuse-overlapping-headers.patch \
%D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
@@@ -1513,12 -1528,7 +1526,8 @@@
%D%/packages/patches/mono-mdoc-timestamping.patch \
%D%/packages/patches/mosaicatcher-unbundle-htslib.patch \
%D%/packages/patches/mrrescue-support-love-11.patch \
+ %D%/packages/patches/mrustc-riscv64-support.patch \
%D%/packages/patches/mtools-mformat-uninitialized.patch \
- %D%/packages/patches/mumps-build-parallelism.patch \
- %D%/packages/patches/mumps-shared-libseq.patch \
- %D%/packages/patches/mumps-shared-mumps.patch \
- %D%/packages/patches/mumps-shared-pord.patch \
%D%/packages/patches/mupen64plus-ui-console-notice.patch \
%D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \
%D%/packages/patches/musl-cross-locale.patch \
@@@ -1772,10 -1783,12 +1781,13 @@@
%D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \
%D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \
%D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \
+ %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \
+ %D%/packages/patches/ruby-anystyle-data-immutable-install.patch \
+ %D%/packages/patches/ruby-anystyle-fix-dictionary-populate.patch \
+ %D%/packages/patches/ruby-latex-decode-fix-test.patch \
%D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
%D%/packages/patches/ruby-sanitize-system-libxml.patch \
- %D%/packages/patches/rustc-1.39.0-src.patch \
+ %D%/packages/patches/rustc-1.54.0-src.patch \
%D%/packages/patches/rust-adblock-ignore-live-tests.patch \
%D%/packages/patches/i3status-rust-enable-unstable-features.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
diff --cc gnu/packages/freedesktop.scm
index 100e7ace9f,037a247243..8546554c53
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -1934,8 -1970,13 +1974,13 @@@ applications define in those files."
"File-MimeInfo-" version ".tar.gz"))
(sha256
(base32
- "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"))))
+ "1i5iw6ri0w9clwpqf40xmsh4isc8xvx2lyf2r5g34886i6rsdgpn"))))
(build-system perl-build-system)
+ (inputs
+ ;; TODO(staging): Make unconditional.
+ (if (%current-target-system)
+ (list bash-minimal) ; for wrap-program
+ '()))
;; If the tests are fixed, add perl-test-pod, perl-test-pod-coverage, and
;; perl-test-tiny as native-inputs.
(propagated-inputs
diff --cc gnu/packages/qt.scm
index beba03936a,8814f7cfd8..2e0ade2376
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -711,16 -816,46 +819,46 @@@ developers using C++ or QML, a CSS & Ja
(variable "XDG_CONFIG_DIRS")
(files '("etc/xdg")))))))
- (define-public qtsvg
- (package (inherit qtbase-5)
+ (define-public qt5compat
+ (package
+ (name "qt5compat")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list icu4c libxkbcommon qtbase qtdeclarative qtshadertools))
+ (home-page (package-home-page qtbase))
+ (synopsis "Legacy Qt 5 APIs ported to Qt 6")
+ (description "The @code{qt5compat} package includes application
+ programming interfaces (APIs) from Qt 5 that were ported to Qt 6, to ease
+ migration. It provides for example the @code{GraphicalEffects} module that
+ came with the @{qtgraphicaleffects} Qt 5 package.")
+ (license (list license:gpl2+ license:lgpl3+)))) ;dual licensed
+
+ (define-public qtsvg-5
+ (package
+ (inherit qtbase-5)
(name "qtsvg")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
- (method url-fetch)
- (uri (qt5-urls name version))
- (sha256
- (base32
- "0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4"))))
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
- "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
++ "0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4"))))
(propagated-inputs `())
(native-inputs (list perl))
(inputs
@@@ -779,10 -916,41 +917,41 @@@ HostData=lib/qt
(description "The QtSvg module provides classes for displaying the
contents of SVG files.")))
+ (define-public qtsvg
+ (package
+ (name "qtsvg")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'set-display
+ (lambda _
+ ;; Make Qt render "offscreen", required for tests.
+ (setenv "QT_QPA_PLATFORM" "offscreen")))
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list libxkbcommon mesa qtbase zlib))
+ (synopsis "Qt module for displaying SVGs")
+ (description "The QtSvg module provides classes for displaying the
+ contents of SVG files.")
+ (home-page (package-home-page qtbase))
+ (license (package-license qtbase))))
+
(define-public qtimageformats
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtimageformats")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -807,17 -986,17 +976,17 @@@
support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtx11extras")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
+ "0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs (list perl))
(inputs
@@@ -827,45 -1006,44 +996,45 @@@
from within Qt 5.")))
(define-public qtxmlpatterns
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtxmlpatterns")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
+ "065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f) ; TODO: Enable the tests
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-network-tests
(lambda _ (substitute* "tests/auto/auto.pro"
(("qxmlquery") "# qxmlquery")
- (("xmlpatterns ") "# xmlpatterns"))
- #t))))))
+ (("xmlpatterns ") "# xmlpatterns"))))
+ (add-after 'unpack 'skip-qquickxmllistmodel-test
+ (lambda _ (substitute* "tests/auto/auto.pro"
+ ((".*qquickxmllistmodel.*") ""))))))))
- (native-inputs (list perl qtdeclarative))
+ (native-inputs (list perl qtdeclarative-5))
(inputs (list qtbase-5))
(synopsis "Qt XML patterns module")
(description "The QtXmlPatterns module is a XQuery and XPath engine for
XML and custom data models. It contains programs such as xmlpatterns and
xmlpatternsvalidator.")))
- (define-public qtdeclarative
- (package (inherit qtsvg)
+ (define-public qtdeclarative-5
+ (package (inherit qtsvg-5)
(name "qtdeclarative")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
+ "0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests
((#:phases phases)
`(modify-phases ,phases
@@@ -873,10 -1051,11 +1042,10 @@@
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
;; The Qt5Core install prefix is set to qtbase, but
qmlcachegen
- ;; is provided by qtdeclarative.
+ ;; is provided by qtdeclarative-5.
(substitute*
"lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
- (("\\$\\{_qt5Core_install_prefix\\}") out)))
- #t))))))
+ (("\\$\\{_qt5Core_install_prefix\\}") out)))))))))
(native-inputs
(list perl
pkg-config
@@@ -893,39 -1072,167 +1062,167 @@@ language and engine infrastructure, an
developers to extend the QML language with custom types and integrate QML code
with JavaScript and C++.")))
+ (define-public qtdeclarative
+ (package
+ (name "qtdeclarative")
+ (version "6.3.1")
+ ;; TODO: Package 'masm' and unbundle from sources.
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-GNinja" ;about twice as fast!
+ "-DQT_BUILD_TESTS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'honor-cmake-install-rpath
+ ;; The build system goes out of its way to compute a runpath it
+ ;; thinks makes more sense, and fails. Revert to the default
+ ;; behavior, which is to honor CMAKE_INSTALL_RPATH.
+ (lambda _
+ (substitute* "src/qml/Qt6QmlMacros.cmake"
+ (("set_target_properties.*PROPERTIES.*INSTALL_RPATH.*" all)
+ (string-append "# " all)))))
+ (add-after 'unpack 'patch-qlibraryinfo-paths
+ (lambda _
+ ;; The QLibraryInfo paths are hard-coded to point to the qtbase
+ ;; installation, but all the tools used in the test suite come
+ ;; from this package.
+ (substitute* (find-files "tests" "\\.cpp$")
+ (("QLibraryInfo::path\\(QLibraryInfo::BinariesPath)")
+ (string-append "QStringLiteral(\"" #$output "/bin\")"))
+
(("QLibraryInfo::path\\(QLibraryInfo::LibraryExecutablesPath)")
+ (string-append "QStringLiteral(\"" #$output
+ "/lib/qt6/libexec\")"))
+ (("QLibraryInfo::path\\(QLibraryInfo::QmlImportsPath)")
+ (string-append "QStringLiteral(\"" #$output
+ "/lib/qt6/qml\")")))))
+ (replace 'build
+ (lambda* (#:key parallel-build? #:allow-other-keys)
+ (apply invoke "cmake" "--build" "."
+ (if parallel-build?
+ `("--parallel" ,(number->string
(parallel-job-count)))
+ '()))))
+ (delete 'check) ;move after the install phase
+ (replace 'install
+ (lambda _
+ (invoke "cmake" "--install" ".")))
+ (add-after 'install 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (when tests?
+ ;; The tests expect to find the modules provided by this
+ ;; package; extend the environment variables needed to do so.
+ ;(setenv "CMAKE_PREFIX_PATH" #$output)
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml"))
+ (setenv "QT_PLUGIN_PATH"
+ (string-append #$output "/lib/qt6/plugins:"
+ (getenv "QT_PLUGIN_PATH")))
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ ;; Skip tests known to fail on GNU/Linux, in a CI context or
+ ;; due to bitness (see: https://code.qt.io/cgit/qt/qtbase.git
+ ;; /tree/src/testlib/qtestblacklist.cpp).
+ (setenv "QTEST_ENVIRONMENT" "linux ci 32bit")
+ (setenv "HOME" "/tmp") ;a few tests require a writable HOME
+ (invoke
+ "ctest" "--output-on-failure"
+ "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")
+ "-E" ;exclude some tests by regex
+ (string-append
+ "("
+ (string-join
+ (list
+ ;; This test is marked as flaky upstream (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-101488).
+ "tst_qquickfiledialogimpl"
+ ;; These tests all fail because 'test_overlappingHandles'
+ ;; (see: https://bugreports.qt.io/browse/QTBUG-95750).
+ "tst_basic"
+ "tst_fusion"
+ "tst_imagine"
+ "tst_material"
+ "tst_universal"
+ ;; Fails due to using the wrong lib/qt6/qml prefix:
+ ;; "Warning: Failed to find the following builtins:
+ ;; builtins.qmltypes, jsroot.qmltypes (so will use
+ ;; qrc). Import paths used:
+ ;; /gnu/store/...-qtbase-6.3.1/lib/qt6/qml"
+ "tst_qmltc_qprocess"
+ ;; These test fail when running qmlimportscanner; perhaps
+ ;; an extra CMAKE_PREFIX_PATH location is missing to
+ ;; correctly locate the imports.
+ "empty_qmldir"
+ "qtquickcompiler"
+ "cmake_tooling_imports"
+ ;; This test seems to hangs for a long time, possibly
+ ;; waiting for a killed process, which becomes a zombie in
+ ;; the build container (perhaps solved after
+ ;; fixing/applying #30948).
+ "tst_qqmlpreview") "|")
+ ")")))))
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively (string-append #$output "/tests")))))))
+ (native-inputs
+ (list ninja
+ perl
+ pkg-config
+ python
+ qtshadertools
+ vulkan-headers))
+ (inputs
+ (list libxkbcommon
+ mesa
+ qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "Qt QML module (Quick 2)")
+ (description "The Qt QML module provides a framework for developing
+ applications and libraries with the QML language. It defines and implements
+ the language and engine infrastructure, and provides an API to enable
+ application developers to extend the QML language with custom types and
+ integrate QML code with JavaScript and C++.")
+ (license (package-license qtbase))))
+
(define-public qtconnectivity
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtconnectivity")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003"))))
+ "0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597"))))
(native-inputs
- (list perl pkg-config qtdeclarative))
+ (list perl pkg-config qtdeclarative-5))
(inputs
(list bluez qtbase-5))
(synopsis "Qt Connectivity module")
(description "The Qt Connectivity modules provides modules for interacting
with Bluetooth and NFC.")))
- (define-public qtwebsockets
- (package (inherit qtsvg)
+ (define-public qtwebsockets-5
+ (package (inherit qtsvg-5)
(name "qtwebsockets")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
+ "0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
- (list perl qtdeclarative))
+ (list perl qtdeclarative-5))
(inputs (list qtbase-5))
(synopsis "Qt Web Sockets module")
(description "WebSocket is a web-based protocol designed to enable two-way
@@@ -934,38 -1241,79 +1231,78 @@@ WebSockets module provides C++ and QML
to act as a server that can process WebSocket requests, or a client that can
consume data received from the server, or both.")))
+ (define-public qtwebsockets
+ (package
+ (name "qtwebsockets")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (delete 'check) ;move after install
+ (add-after 'install 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH")))))
+ (add-after 'prepare-for-tests 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'check 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list qtbase qtdeclarative))
+ (synopsis "Qt Web Sockets module")
+ (description "WebSocket is a web-based protocol designed to enable two-way
+ communication between a client application and a remote host. The Qt
+ WebSockets module provides C++ and QML interfaces that enable Qt applications
+ to act as a server that can process WebSocket requests, or a client that can
+ consume data received from the server, or both.")
+ (home-page (package-home-page qtbase))
+ (license (package-license qtbase))))
+
(define-public qtsensors
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtsensors")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
+ "0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:parallel-tests? _ #f) #f) ; can lead to race condition
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'fix-tests
(lambda _
(substitute*
"tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
- (("2000") "5000") ;lengthen test timeout
- (("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test
- #t))))))
+ (("2000") "5000")
;lengthen test timeout
+ (("QTest::newRow(\"twist\") << \"twist\"") ""))))))))
;failing test
(native-inputs
- (list perl qtdeclarative))
+ (list perl qtdeclarative-5))
(inputs (list qtbase-5))
(synopsis "Qt Sensors module")
(description "The Qt Sensors API provides access to sensor hardware via
QML
and C++ interfaces. The Qt Sensors API also provides a motion gesture
recognition API for devices.")))
- (define-public qtmultimedia
- (package (inherit qtsvg)
+ (define-public qtmultimedia-5
+ (package
+ (inherit qtsvg-5)
(name "qtmultimedia")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -979,9 -1327,10 +1316,9 @@@
"examples/multimedia/spectrum/3rdparty")
;; We also prevent the spectrum example from being built.
(substitute* "examples/multimedia/multimedia.pro"
- (("spectrum") "#"))
- #t))))
+ (("spectrum") "#"))))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(replace 'configure
@@@ -1006,18 -1355,113 +1343,113 @@@
record media, and manage a collection of media content. It also contains a
set of plugins for interacting with pulseaudio and GStreamer.")))
+ (define-public qtshadertools
+ (package
+ (name "qtshadertools")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ ;; Note: the source bundles *patched* glslang and SPIRV-Cross
+ ;; sources.
+ (sha256
+ (base32
+ "0nj35s2z5n438q7nqf6bnj3slwz2am3169ck1ixwqa0mjrv73dsr"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-before 'check 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+ (native-inputs (list perl))
+ (inputs (list glslang libxkbcommon qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "Shader pipeline API and and tools for Qt")
+ (description "The @code{qtshadertools} module provides APIs and tools
+ supporting shader pipeline functionality as offered in Qt Quick to operate on
+ Vulkan, OpenGL and other main graphic APIs.")
+ (license (package-home-page qtbase))))
+
+ (define-public qtmultimedia
+ (package
+ (name "qtmultimedia")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively
+ "examples/multimedia/spectrum/3rdparty")
+ ;; We also prevent the spectrum example from being built.
+ (substitute* "examples/multimedia/multimedia.pro"
+ (("spectrum") "#"))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON"
+ "-DQT_FEATURE_pulseaudio=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-integration-tests
+ (lambda _
+ ;; XXX: The tst_qaudiodecoderbackend, tst_qaudiodevice,
+ ;; tst_qaudiosource, tst_qmediaplayerbackend and
+ ;; tst_qcamerabackend tests fail, presumably because they
+ ;; require a functional pulseaudio daemon (which requires a dbus
+ ;; session bus, which requires an X11 server, and then is still
+ ;; unhappy).
+ (substitute* "tests/auto/CMakeLists.txt"
+ (("add_subdirectory\\(integration)") ""))))
+ (add-before 'check 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")))
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively (string-append #$output "/tests")))))))
+ (native-inputs
+ (list perl
+ pkg-config
+ qtshadertools
+ vulkan-headers))
+ (inputs
+ (list alsa-lib
+ glib
+ gstreamer
+ gst-plugins-base ;gstreamer-gl
+ gst-plugins-good ;camera support, additional plugins
+ gst-libav ;ffmpeg plugin
+ libxkbcommon
+ mesa
+ qtbase
+ qtdeclarative
+ pulseaudio))
+ (home-page (package-home-page qtbase))
+ (synopsis "Qt Multimedia module")
+ (description "The Qt Multimedia module provides set of APIs to play and
+ record media, and manage a collection of media content. It also contains a
+ set of plugins for interacting with pulseaudio and GStreamer.")
+ (license (package-license qtbase))))
+
(define-public qtwayland
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwayland")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
+ (patches (search-patches "qtwayland-gcc-11.patch"))
(sha256
(base32
- "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
+ "0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-failing-tests
@@@ -1033,30 -1478,31 +1465,30 @@@
(add-before 'check 'set-test-environment
(lambda _
;; Do not fail just because /etc/machine-id is missing.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))))))
+ (setenv "DBUS_FATAL_WARNINGS" "0")))))))
(native-inputs
- (list glib perl pkg-config qtdeclarative))
+ (list glib perl pkg-config qtdeclarative-5))
(inputs
- `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("libx11" ,libx11)
- ("libxcomposite" ,libxcomposite)
- ("libxext" ,libxext)
- ("libxkbcommon" ,libxkbcommon)
- ("libxrender" ,libxrender)
- ("mesa" ,mesa)
- ("mtdev" ,mtdev)
- ("qtbase" ,qtbase-5)
- ("vulkan-headers" ,vulkan-headers)
- ("wayland" ,wayland)))
+ (list fontconfig
+ freetype
+ libx11
+ libxcomposite
+ libxext
+ libxkbcommon
+ libxrender
+ mesa
+ mtdev
+ qtbase-5
+ vulkan-headers
+ wayland))
(synopsis "Qt Wayland module")
(description "The Qt Wayland module provides the QtWayland client and
compositor libraries.")))
(define-public qtserialport
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtserialport")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -1083,17 -1530,17 +1515,17 @@@
interacting with serial ports from within Qt.")))
(define-public qtserialbus
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtserialbus")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
+ "180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-libsocketcan-reference
@@@ -1111,18 -1559,18 +1543,18 @@@
access the various industrial serial buses and protocols, such as CAN, ModBus,
and others.")))
- (define-public qtwebchannel
- (package (inherit qtsvg)
+ (define-public qtwebchannel-5
+ (package (inherit qtsvg-5)
(name "qtwebchannel")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj"))))
+ "1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf"))))
(native-inputs
- (list perl qtdeclarative qtwebsockets))
+ (list perl qtdeclarative-5 qtwebsockets-5))
(inputs (list qtbase-5))
(synopsis "Web communication library for Qt")
(description "The Qt WebChannel module enables peer-to-peer communication
@@@ -1130,26 -1578,64 +1562,63 @@@ between the host (QML/C++ application)
application). The transport mechanism is supported out of the box by the two
popular web engines, Qt WebKit 2 and Qt WebEngine.")))
+ (define-public qtwebchannel
+ (package
+ (name "qtwebchannel")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (delete 'check) ;move after install
+ (add-after 'install 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH")))))
+ (add-after 'prepare-for-tests 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'check 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list qtbase qtdeclarative qtwebsockets))
+ (home-page (package-home-page qtbase))
+ (synopsis "Web communication library for Qt")
+ (description "The Qt WebChannel module enables peer-to-peer communication
+ between the host (QML/C++ application) and the client (HTML/JavaScript
+ application).")
+ (license (package-license qtbase))))
+
(define-public qtwebglplugin
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwebglplugin")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
+ "1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-network-tests
(lambda _ (substitute* "tests/plugins/platforms/platforms.pro"
- (("webgl") "# webgl"))
- #t))))))
+ (("webgl") "# webgl"))))))))
(native-inputs '())
(inputs
- (list mesa qtbase-5 qtdeclarative qtwebsockets zlib))
+ (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
(synopsis "QPA plugin for running an application via a browser using
streamed WebGL commands")
(description "Qt back end that uses WebGL for rendering. It allows Qt
@@@ -1159,9 -1645,9 +1628,9 @@@ compatible web browser without the use
OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(define-public qtwebview
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwebview")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -1178,46 -1664,76 +1647,78 @@@ application without necessarily includi
native APIs where it makes sense.")))
(define-public qtlocation
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtlocation")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (string-append
"https://download.qt.io/official_releases/qt/";
- (version-major+minor version) "/" version
- "/submodules/" name "-everywhere-src-"
- version ".tar.xz"))
+ (uri (qt5-urls name version))
(sha256
(base32
- "184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq"))))
+ "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ ((#:tests? _ #f) #f) ; TODO: Enable the tests
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" "/tmp")))))))
(native-inputs
- (list perl qtdeclarative qtquickcontrols qtserialport))
+ (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport))
(inputs
(list icu4c openssl qtbase-5 zlib))
(synopsis "Qt Location and Positioning modules")
(description "The Qt Location module provides an interface for location,
positioning and geolocation plugins.")))
- (define-public qttools
- (package (inherit qtsvg)
+ (define-public qtlottie
+ (package
+ (name "qtlottie")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'check) ;move after install
+ (add-after 'install 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH"))))))))
+ (native-inputs (list perl))
+ (inputs (list libxkbcommon qtbase qtdeclarative))
+ (home-page (package-home-page qtbase))
+ (synopsis "QML API for rendering Bodymovin graphics and animations")
+ (description "Qt Lottie Animation provides a QML API for rendering
+ graphics and animations that are exported in JSON format by the Bodymovin
+ plugin for Adobe After Effects.")
+ (license (package-license qtbase))))
+
+ (define-public qttools-5
+ (package (inherit qtsvg-5)
(name "qttools")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
+ "0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
- (list perl qtdeclarative vulkan-headers))
+ (list perl qtdeclarative-5 vulkan-headers))
(inputs
(list mesa qtbase-5))
(synopsis "Qt Tools and Designer modules")
@@@ -1225,19 -1741,46 +1726,46 @@@
the documentation, translate applications, generate help files and other stuff
that helps in Qt development.")))
+ (define-public qttools
+ (package
+ (name "qttools")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; The build system attempts to fetch online resources and fails when
+ ;; building the test suite.
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF")))
+ (native-inputs (list perl qtdeclarative vulkan-headers))
+ (inputs (list libxkbcommon mesa qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "Qt Tools and Designer modules")
+ (description "The Qt Tools module provides a set of applications to browse
+ the documentation, translate applications, generate help files and other stuff
+ that helps in Qt development.")
+ ;; GPL 3 only with Qt GPL exception 1.0 (see:
+ ;; LICENSES/Qt-GPL-exception-1.0.txt).
+ (license (list license:gpl3))))
+
(define-public qtscript
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtscript")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2"))
+ "17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm"))
(patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs
- (list perl qttools))
+ (list perl qttools-5))
(inputs
(list qtbase-5))
(synopsis "Qt Script module")
@@@ -1245,62 -1788,68 +1773,68 @@@
The following guides and references cover aspects of programming with
ECMAScript and Qt.")))
- (define-public qtquickcontrols
- (package (inherit qtsvg)
+ (define-public qtquickcontrols-5
+ (package (inherit qtsvg-5)
(name "qtquickcontrols")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
+ "0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Quick Controls and other Quick modules")
(description "The QtScript module provides classes for making Qt
applications scriptable. This module provides a set of extra components that
can be used to build complete interfaces in Qt Quick.")))
- (define-public qtquickcontrols2
- (package (inherit qtsvg)
+ (define-public qtquickcontrols2-5
+ (package (inherit qtsvg-5)
(name "qtquickcontrols2")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
+ "1cxg4ml07k1zcyi5m4lx06sz8f5l67isb5vhk7nakxm0wnn7p8y4"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Quick Controls 2 and other Quick 2 modules")
(description "The Qt Quick Controls 2 module contains the Qt Labs Platform
module that provides platform integration: native dialogs, menus and menu
bars,
and tray icons. It falls back to Qt Widgets when a native implementation is
not available.")))
+ (define-public qtquickcontrols2
+ ;; qtquickcontrols2 still exist, but was merged into qtdeclarative.
+ ;; Unfortunately that hasn't been well communicated at all (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-79454).
+ (deprecated-package "qtquickcontrols2" qtdeclarative))
+
(define-public qtgraphicaleffects
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtgraphicaleffects")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
+ "0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Graphical Effects module")
(description "The Qt Graphical Effects module provides a set of QML types
for adding visually impressive and configurable effects to user interfaces.
@@@ -1310,9 -1859,9 +1844,9 @@@ types. The effects cover functional ar
coloring, and many more.")))
(define-public qtgamepad
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtgamepad")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -1336,9 -1885,9 +1870,9 @@@ primary target audience are embedded de
and mobile applications targeting TV-like form factors.")))
(define-public qtscxml
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtscxml")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -1351,12 -1900,10 +1885,12 @@@
(delete-file-recursively "tests/3rdparty")
;; the scion test refers to the bundled 3rd party test code.
(substitute* "tests/auto/auto.pro"
- (("scion") "#"))
- #t))))
+ (("scion") "#"))))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt SCXML module")
(description "The Qt SCXML module provides functionality to create state
machines from SCXML files. This includes both dynamically creating state
@@@ -1364,43 -1911,67 +1898,73 @@@ machines (loading the SCXML file and in
generating a C++ file that has a class implementing the state machine. It
also contains functionality to support data models and executable content.")))
+ (define-public qtpositioning
+ (package
+ (name "qtpositioning")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (inputs (list perl qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "QML and C++ positioning information API")
+ (description "The Qt Positioning API provides positioning information via
+ QML and C++ interfaces. The Qt Positioning API lets you to determine a
+ position by using a variety of possible sources, including satellite, wifi, or
+ text files. That information can then be used to, for example, determine a
+ position on a map. In addition, you can use to the API to retrieve satellite
+ information and perform area based monitoring.")
+ (license (package-license qtbase))))
+
(define-public qtpurchasing
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtpurchasing")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
+ "04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7"))))
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Purchasing module")
(description "The Qt Purchasing module provides and in-app API for
purchasing goods and services.")))
(define-public qtcharts
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtcharts")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
+ "0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'remove-failing-test
+ (lambda _
+ (substitute* "tests/auto/auto.pro"
+ (("qml") "# qml")
+ (("qml-qtquicktest") "# qml-qtquicktest"))))))))
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Charts module")
(description "The Qt Charts module provides a set of easy to use chart
components. It uses the Qt Graphics View Framework, therefore charts can be
@@@ -1410,20 -1981,20 +1974,20 @@@ selecting one of the charts themes."
(license license:gpl3)))
(define-public qtdatavis3d
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtdatavis3d")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
+ "0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Data Visualization module")
(description "The Qt Data Visualization module provides a way to visualize
data in 3D as bar, scatter, and surface graphs. It is especially useful for
@@@ -1432,10 -2003,10 +1996,10 @@@ data received from multiple sensors. Th
customized by using themes or by adding custom items and labels to them.")
(license license:gpl3)))
- (define-public qtnetworkauth
- (package (inherit qtsvg)
+ (define-public qtnetworkauth-5
+ (package (inherit qtsvg-5)
(name "qtnetworkauth")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
@@@ -1448,18 -2029,38 +2012,38 @@@
(description "The Qt Network Authorization module provides an
implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
+ (define-public qtnetworkauth
+ (package
+ (name "qtnetworkauth")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn"))))
+ (build-system cmake-build-system)
+ (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
+ (native-inputs (list perl))
+ (inputs (list qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "Qt Network Authorization module")
+ (description "The Qt Network Authorization module provides an
+ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
+ (license (package-license qtbase))))
+
(define-public qtremoteobjects
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtremoteobjects")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
+ "1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'remove-failing-test
@@@ -1471,9 -2072,10 +2055,9 @@@
;; disable failing tests: they need network
(substitute* "tests/auto/auto.pro"
(("integration_multiprocess proxy_multiprocess
integration_external restart")
- "integration_multiprocess"))
- #t))))))
+ "integration_multiprocess"))))))))
(inputs
- (list qtbase-5 qtdeclarative))
+ (list qtbase-5 qtdeclarative-5))
(synopsis "Qt Remote Objects module")
(description "The Qt Remote Objects module is an @dfn{inter-process
communication} (IPC) module developed for Qt. The idea is to extend existing
@@@ -1481,17 -2083,18 +2065,17 @@@ Qt's functionalities to enable an easy
processes or computers.")))
(define-public qtspeech
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtspeech")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (qt5-urls name version))
(sha256
(base32
- "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
-
+ "0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5))
@@@ -1534,11 -2137,11 +2118,11 @@@ using the Enchant spell-checking librar
;; COPYING file specify GPL3, but source code files all refer to GPL2+.
(license license:gpl2+)))
- (define-public qtwebengine
+ (define-public qtwebengine-5
(package
- (inherit qtsvg)
+ (inherit qtsvg-5)
(name "qtwebengine")
- (version (package-version qtbase-5))
+ (version "5.15.5")
(source
(origin
(method url-fetch)