[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: Merge branch 'master' into core-updates.
|
From: |
guix-commits |
|
Subject: |
05/05: Merge branch 'master' into core-updates. |
|
Date: |
Fri, 14 Apr 2023 17:32:03 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 3bacd3c76a58ebe70f98be654f09cbd4166093ab
Merge: df3391c030 97ed675718
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Apr 14 16:57:37 2023 -0400
Merge branch 'master' into core-updates.
Conflicts:
gnu/local.mk
gnu/packages/build-tools.scm
gnu/packages/certs.scm
gnu/packages/check.scm
gnu/packages/compression.scm
gnu/packages/cups.scm
gnu/packages/fontutils.scm
gnu/packages/gnuzilla.scm
gnu/packages/guile.scm
gnu/packages/ibus.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/music.scm
gnu/packages/nss.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/qt.scm
gnu/packages/ruby.scm
gnu/packages/shells.scm
gnu/packages/tex.scm
gnu/packages/video.scm
gnu/packages/vulkan.scm
gnu/packages/web.scm
gnu/packages/webkit.scm
gnu/packages/wm.scm
.guix-authorizations | 12 -
NEWS | 3 +
doc/contributing.texi | 12 +-
doc/guix.texi | 393 +-
etc/guix-install.sh | 17 +-
etc/news.scm | 76 +-
etc/release-manifest.scm | 1 +
etc/teams.scm.in | 32 +-
gnu/home/services/desktop.scm | 6 +-
gnu/home/services/gnupg.scm | 150 +
gnu/home/services/shells.scm | 12 +-
gnu/home/services/xdg.scm | 22 +-
gnu/local.mk | 22 +-
gnu/packages/admin.scm | 58 +-
gnu/packages/algebra.scm | 90 +-
gnu/packages/android.scm | 17 +-
gnu/packages/astronomy.scm | 99 +-
gnu/packages/audio.scm | 154 +-
gnu/packages/backup.scm | 15 +-
gnu/packages/benchmark.scm | 43 +-
gnu/packages/bioconductor.scm | 547 ++-
gnu/packages/bioinformatics.scm | 135 +-
gnu/packages/build-tools.scm | 45 +-
gnu/packages/c.scm | 79 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/cdrom.scm | 1 +
gnu/packages/check.scm | 35 +-
gnu/packages/chez.scm | 10 +-
gnu/packages/compression.scm | 14 +
gnu/packages/cran.scm | 834 +++-
gnu/packages/crates-graphics.scm | 7 +-
gnu/packages/crates-io.scm | 2489 +++++++---
gnu/packages/crypto.scm | 2 +
gnu/packages/cups.scm | 15 +-
gnu/packages/curl.scm | 3 -
gnu/packages/databases.scm | 329 +-
gnu/packages/datastructures.scm | 40 +
gnu/packages/debug.scm | 4 +-
gnu/packages/diffoscope.scm | 6 +-
gnu/packages/dlang.scm | 4 +-
gnu/packages/education.scm | 4 +-
gnu/packages/efi.scm | 4 -
gnu/packages/electronics.scm | 22 +-
gnu/packages/emacs-xyz.scm | 1035 ++--
gnu/packages/emulators.scm | 49 +-
gnu/packages/engineering.scm | 195 +-
gnu/packages/erlang.scm | 6 +-
gnu/packages/fcitx.scm | 8 +-
gnu/packages/fcitx5.scm | 36 +-
gnu/packages/file-systems.scm | 113 +
gnu/packages/finance.scm | 28 +-
gnu/packages/fonts.scm | 97 +-
gnu/packages/fontutils.scm | 79 +-
gnu/packages/freedesktop.scm | 342 +-
gnu/packages/games.scm | 49 +-
gnu/packages/geo.scm | 173 +-
gnu/packages/ghostscript.scm | 19 +-
gnu/packages/gl.scm | 23 +-
gnu/packages/gnome-xyz.scm | 50 +-
gnu/packages/gnome.scm | 40 +-
gnu/packages/gnunet.scm | 151 +-
gnu/packages/gnuzilla.scm | 216 +-
gnu/packages/golang.scm | 407 +-
gnu/packages/graphics.scm | 163 +-
gnu/packages/gstreamer.scm | 90 +-
gnu/packages/gtk.scm | 35 +
gnu/packages/guile-xyz.scm | 37 +
gnu/packages/guile.scm | 8 -
gnu/packages/hardware.scm | 21 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/haskell-xyz.scm | 3 +
gnu/packages/high-availability.scm | 53 +-
gnu/packages/ibus.scm | 38 +-
gnu/packages/image-processing.scm | 166 +-
gnu/packages/image-viewers.scm | 62 +-
gnu/packages/image.scm | 15 +-
gnu/packages/jami.scm | 70 +-
gnu/packages/kde.scm | 9 +-
gnu/packages/kerberos.scm | 26 +-
gnu/packages/language.scm | 105 +-
gnu/packages/less.scm | 5 +-
gnu/packages/libcanberra.scm | 6 -
gnu/packages/license.scm | 12 +-
gnu/packages/linphone.scm | 3 -
gnu/packages/linux.scm | 184 +-
gnu/packages/lisp-check.scm | 36 +-
gnu/packages/lisp-xyz.scm | 1716 ++++++-
gnu/packages/lisp.scm | 126 +-
gnu/packages/llvm.scm | 2 +-
gnu/packages/lua.scm | 9 +-
gnu/packages/machine-learning.scm | 169 +-
gnu/packages/mail.scm | 68 +-
gnu/packages/man.scm | 4 +-
gnu/packages/mastodon.scm | 4 +-
gnu/packages/maths.scm | 692 +--
gnu/packages/medical.scm | 55 +
gnu/packages/messaging.scm | 17 +-
gnu/packages/minetest.scm | 9 +-
gnu/packages/monitoring.scm | 5 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/mpi.scm | 17 +-
gnu/packages/music.scm | 377 +-
gnu/packages/networking.scm | 235 +-
gnu/packages/node.scm | 1 -
gnu/packages/nss.scm | 8 +-
gnu/packages/ocaml.scm | 4 +-
gnu/packages/ocr.scm | 15 +-
gnu/packages/opencl.scm | 73 +-
gnu/packages/package-management.scm | 346 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 52 +-
gnu/packages/patches/a2ps-CVE-2001-1593.patch | 69 -
gnu/packages/patches/a2ps-CVE-2014-0466.patch | 30 -
gnu/packages/patches/a2ps-CVE-2015-8107.patch | 80 -
.../dbacl-icheck-multiple-definitions.patch | 33 +
gnu/packages/patches/fpm-newer-clamp-fix.patch | 33 +
gnu/packages/patches/geeqie-clutter.patch | 35 -
.../patches/glslang-install-static-libs.patch | 61 +
.../guile-fix-invalid-unicode-handling.patch | 83 +
gnu/packages/patches/heimdal-CVE-2022-45142.patch | 49 +
.../patches/jami-libjami-headers-search.patch | 45 +-
gnu/packages/patches/libcdio-glibc-compat.patch | 43 +
gnu/packages/patches/mariadb-link-libatomic.patch | 83 -
gnu/packages/patches/mecab-variable-param.patch | 30 +
.../patches/openboardview-use-system-mpc.patch | 42 +
.../patches/openboardview-use-system-utf8.patch | 48 -
.../patches/orangeduck-mpc-fix-pkg-config.patch | 25 +
.../python-afdko-suppress-copyright-test.patch | 20 -
.../patches/python2-pyopenssl-openssl-compat.patch | 51 -
.../patches/ruby-hiredis-use-system-hiredis.patch | 52 +
.../patches/rust-openssl-sys-no-vendor.patch | 30 +-
gnu/packages/patches/webkitgtk-libelogind.patch | 38 +
gnu/packages/patchutils.scm | 4 +-
gnu/packages/pdf.scm | 2 +-
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 85 +-
gnu/packages/photo.scm | 166 +-
gnu/packages/plotutils.scm | 55 +
gnu/packages/potassco.scm | 376 ++
gnu/packages/pretty-print.scm | 94 +-
gnu/packages/protobuf.scm | 55 +-
gnu/packages/python-check.scm | 9 +-
gnu/packages/python-compression.scm | 16 +-
gnu/packages/python-crypto.scm | 295 +-
gnu/packages/python-science.scm | 165 +-
gnu/packages/python-web.scm | 100 +-
gnu/packages/python-xyz.scm | 535 ++-
gnu/packages/qt.scm | 1092 ++---
gnu/packages/radio.scm | 89 +-
gnu/packages/rails.scm | 1444 ++++--
gnu/packages/ruby.scm | 4932 +++++++++++++++-----
gnu/packages/rust-apps.scm | 59 +-
gnu/packages/scheme.scm | 177 +-
gnu/packages/sdl.scm | 82 +-
gnu/packages/search.scm | 4 +-
gnu/packages/security-token.scm | 58 +
gnu/packages/shells.scm | 10 +-
gnu/packages/shellutils.scm | 59 +-
gnu/packages/skarnet.scm | 36 +-
gnu/packages/sphinx.scm | 31 +-
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 137 +-
gnu/packages/sync.scm | 2 +-
gnu/packages/syncthing.scm | 4 +-
gnu/packages/syndication.scm | 6 +-
gnu/packages/telephony.scm | 11 +-
gnu/packages/tex.scm | 362 +-
gnu/packages/texinfo.scm | 4 +-
gnu/packages/text-editors.scm | 18 +-
gnu/packages/textutils.scm | 19 +-
gnu/packages/time.scm | 4 +-
gnu/packages/toolkits.scm | 58 +-
gnu/packages/tree-sitter.scm | 7 +
gnu/packages/tryton.scm | 3 -
gnu/packages/unicode.scm | 18 +-
gnu/packages/version-control.scm | 134 +-
gnu/packages/video.scm | 115 +-
gnu/packages/vulkan.scm | 254 +-
gnu/packages/w3m.scm | 23 +-
gnu/packages/web-browsers.scm | 12 +-
gnu/packages/web.scm | 44 +-
gnu/packages/webkit.scm | 62 +-
gnu/packages/wm.scm | 42 +-
gnu/packages/xdisorg.scm | 166 +-
gnu/packages/xfce.scm | 61 +-
gnu/packages/xiph.scm | 8 +-
gnu/packages/xorg.scm | 216 +-
gnu/services/audio.scm | 249 +-
gnu/services/base.scm | 129 +-
gnu/services/configuration.scm | 96 +-
gnu/services/desktop.scm | 76 +-
gnu/services/herd.scm | 24 +-
gnu/services/linux.scm | 101 +
gnu/services/mcron.scm | 103 +-
gnu/services/networking.scm | 67 +-
gnu/services/sddm.scm | 6 -
gnu/services/security.scm | 6 +-
gnu/services/vnc.scm | 5 +-
gnu/services/web.scm | 25 +-
gnu/services/xorg.scm | 23 +-
gnu/system.scm | 10 +-
gnu/system/linux-container.scm | 10 +-
gnu/tests/databases.scm | 6 +-
gnu/tests/gdm.scm | 40 +-
gnu/tests/lightdm.scm | 2 +-
gnu/tests/pam.scm | 97 +
guix/build/po.scm | 17 +-
guix/build/qt-utils.scm | 5 +-
guix/build/syscalls.scm | 5 +-
guix/import/cpan.scm | 3 +-
guix/import/elpa.scm | 3 +-
guix/import/hackage.scm | 2 +-
guix/import/minetest.scm | 3 +-
guix/import/opam.scm | 10 +-
guix/import/stackage.scm | 2 +-
guix/import/texlive.scm | 55 +-
guix/lint.scm | 14 +-
guix/packages.scm | 9 -
guix/scripts/environment.scm | 66 +-
guix/scripts/import/opam.scm | 4 +-
guix/scripts/refresh.scm | 4 +-
guix/scripts/shell.scm | 2 +
guix/substitutes.scm | 10 +-
guix/svn-download.scm | 6 +-
po/guix/POTFILES.in | 10 +
tests/graph.scm | 2 +-
tests/guix-environment-container.sh | 9 +
tests/guix-home.sh | 2 +-
tests/import-utils.scm | 2 +-
tests/networking.scm | 11 -
tests/services/configuration.scm | 194 +-
231 files changed, 20558 insertions(+), 7921 deletions(-)
diff --cc gnu/local.mk
index 4151c91984,0849d32276..f473082203
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1127,8 -1136,8 +1128,9 @@@ dist_patch_DATA =
%D%/packages/patches/fp16-implicit-double.patch \
%D%/packages/patches/fp16-system-libraries.patch \
%D%/packages/patches/fpc-reproducibility.patch \
+ %D%/packages/patches/fpm-newer-clamp-fix.patch \
%D%/packages/patches/freedink-engine-fix-sdl-hints.patch \
+ %D%/packages/patches/freeimage-libtiff-compat.patch \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-glibc-2.34.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \
@@@ -1243,7 -1247,9 +1244,8 @@@
%D%/packages/patches/glibc-versioned-locpath.patch \
%D%/packages/patches/glibc-2.29-git-updates.patch \
%D%/packages/patches/glibc-2.29-supported-locales.patch \
- %D%/packages/patches/glibc-static-nss.patch \
%D%/packages/patches/glibc-supported-locales.patch \
+ %D%/packages/patches/glslang-install-static-libs.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnash-fix-giflib-version.patch \
@@@ -1292,9 -1299,9 +1294,10 @@@
%D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \
%D%/packages/patches/guile-fibers-fd-finalizer-leak.patch \
%D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \
+ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \
%D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \
%D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \
+ %D%/packages/patches/guile-hurd-posix-spawn.patch \
%D%/packages/patches/guile-present-coding.patch \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
%D%/packages/patches/guile-emacs-fix-configure.patch \
@@@ -1614,14 -1618,10 +1619,14 @@@
%D%/packages/patches/onnx-skip-model-downloads.patch \
%D%/packages/patches/openbios-aarch64-riscv64-support.patch \
%D%/packages/patches/openboardview-use-system-imgui.patch \
- %D%/packages/patches/openboardview-use-system-utf8.patch \
+ %D%/packages/patches/openboardview-use-system-mpc.patch \
%D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \
+ %D%/packages/patches/openjdk-9-pointer-comparison.patch \
+ %D%/packages/patches/openjdk-9-setsignalhandler.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-pointer-comparison.patch \
+ %D%/packages/patches/openjdk-10-setsignalhandler.patch \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \
%D%/packages/patches/openssh-hurd.patch \
@@@ -1737,7 -1733,7 +1743,6 @@@
%D%/packages/patches/python-3-search-paths.patch \
%D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \
- %D%/packages/patches/python-afdko-suppress-copyright-test.patch \
- %D%/packages/patches/python-3-no-static-lib.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \
diff --cc gnu/packages/build-tools.scm
index 2b55725100,8a6cfae692..e1c9b14bb2
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@@ -13,8 -13,8 +13,8 @@@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 qblade <qblade@protonmail.com>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
- ;;; Copyright © 2022 Juliana Sims <jtsims@protonmail.com>
+ ;;; Copyright © 2022, 2023 Juliana Sims <jtsims@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/calendar.scm
index c65db2b69e,cf4286100d..2a5f79074d
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@@ -131,35 -129,35 +131,35 @@@ the <tz.h> library for handling time zo
version "/libical-" version ".tar.gz"))
(sha256
(base32
- "13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122"))))
+ "0cqc1wpalxmxjx8dmcaga9w8kd5l7944hqmidz43hifaf7fhaixl"))))
(build-system cmake-build-system)
(arguments
- '(#:tests? #f ; test suite appears broken
- #:parallel-build? #f ;may cause GIR generation failure
- #:configure-flags '("-DSHARED_ONLY=true"
- ;; required by evolution-data-server
- "-DGOBJECT_INTROSPECTION=true"
- "-DICAL_GLIB_VAPI=true")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-docbook-reference
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute*
"doc/reference/libical-glib/libical-glib-docs.sgml.in"
- (("http://www.oasis-open.org/docbook/xml/4.3/";)
- (string-append (assoc-ref inputs "docbook-xml")
- "/xml/dtd/docbook/")))))
- (add-before 'configure 'patch-paths
- (lambda* (#:key inputs #:allow-other-keys)
- ;; TODO: libical 3.1.0 supports using TZDIR instead of a
hard-coded
- ;; zoneinfo database. When that is released we can drop
- ;; the tzdata dependency.
- (let ((tzdata (assoc-ref inputs "tzdata")))
- (substitute* "src/libical/icaltz-util.c"
- (("\\\"/usr/share/zoneinfo\\\",")
- (string-append "\"" tzdata "/share/zoneinfo\""))
- (("\\\"/usr/lib/zoneinfo\\\",") "")
- (("\\\"/etc/zoneinfo\\\",") "")
- (("\\\"/usr/share/lib/zoneinfo\\\"") ""))))))))
+ (list
+ #:configure-flags #~(list "-DSHARED_ONLY=true"
+ ;; required by evolution-data-server
+ "-DGOBJECT_INTROSPECTION=true"
+ "-DICAL_GLIB_VAPI=true")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-reference
+ (lambda _
+ (substitute*
"doc/reference/libical-glib/libical-glib-docs.sgml.in"
+ (("http://www.oasis-open.org/docbook/xml/4.3/";)
+ (string-append #$(this-package-native-input "docbook-xml")
+ "/xml/dtd/docbook/")))))
+ (add-before 'configure 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define zoneinfo (search-input-directory inputs
"share/zoneinfo"))
+ ;; The timezones test fails if TZDIR is not set, for some
+ ;; reason. If only TZDIR is set, tests checking the timezone
+ ;; fallback fail, so also patch the source.
+ (setenv "TZDIR" zoneinfo) ;for tests
+ (substitute* "src/libical/icaltz-util.c"
+ (("\\\"/usr/share/zoneinfo\\\",")
+ (format #f "~s" zoneinfo))
+ (("\\\"/usr/lib/zoneinfo\\\",") "")
+ (("\\\"/etc/zoneinfo\\\",") "")
+ (("\\\"/usr/share/lib/zoneinfo\\\"") "")))))))
(native-inputs
(list docbook-xml-4.3
gobject-introspection
diff --cc gnu/packages/cups.scm
index 5791d4994a,3299cd1160..beeb05c50d
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@@ -255,77 -261,90 +255,88 @@@ filters for the PDF-centric printing wo
(uri (git-reference
(url "https://github.com/OpenPrinting/cups";)
(commit (string-append "v" version))))
- (file-name (git-file-name name version))
+ ;; Avoid NAME confusion: these are the complete CUPS sources.
+ (file-name (git-file-name "cups" version))
(sha256
- (base32 "126d6kd3pkhmsvbcflkcpk3y30iqlkdqyvrk9aqq88vbxzjd5ia6"))))
+ (base32 "01nn6ij7kpf2vzikinn7mk4crjx4ab8m4pplvsccc8gg30a2q9y9"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- '("--disable-launchd"
- "--disable-systemd"
- "--disable-avahi"
- "--disable-dnssd")
- ;; Seven tests fail, mostly because of files that are provided by the
- ;; cups-filters package.
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'never-cupsAdminGetServerSettings
- ;; Instead of querying the daemon directly, this part of CUPS
assumes
- ;; that (1) it has access to a cupsd.conf under CUPS_SERVERROOT,
and
- ;; (2) the file's contents apply to the running daemon. (1) is
false
- ;; at least on Guix Systems resulting in extremely long delays when
- ;; loading the Web interface's /admin page. (2) isn't valid
anywhere
- ;; because it ignores, e.g., -c FILE.
- ;; Upstream considers this code on ‘life support’ so just neuter
it.
- (lambda _
- (substitute* "cgi-bin/admin.c"
- (("!cupsAdminGetServerSettings" match)
- (string-append "0 && " match)))))
- (add-after 'unpack 'remove-Web-UI-server-settings
- ;; The /admin page's server configuration form is questionable for
- ;; the same reason as cupsAdminGetServerSettings, and won't work at
- ;; all on Guix Systems. Remove it entirely.
- (lambda _
- ;; SUBSTITUTE* and a patch both have (dis)advantages. This is
- ;; shorter & should ensure that no translation is forgotten.
- (substitute* (find-files "templates" "^admin\\.tmpl$")
- ((" class=\"halves\"") "")
- (("<FORM.* ACTION=\"/jobs.*</FORM>" match)
- (string-append match "</P>{BROKEN? "))
- (("</FORM>}" match)
- (string-append match "}")))))
- (add-before 'configure 'patch-makedefs
- (lambda _
- (substitute* "Makedefs.in"
- (("INITDIR.*=.*@INITDIR@") "INITDIR = @prefix@/@INITDIR@")
- (("/bin/sh") (which "sh")))
- #t))
- (add-before 'build 'patch-tests
- (lambda _
- (substitute* "tools/ippeveprinter.c"
- (("# else /\\* HAVE_AVAHI \\*/")
- "#elif defined(HAVE_AVAHI)"))
- #t))
- ,@(if (target-riscv64?)
- `((add-after 'unpack 'update-config-scripts
+ (list #:configure-flags
+ ;; This package isn't maximally minimal:
"--with-components=libcups"
+ ;; breaks cups-filters. Disable some other unnecessary features.
+ #~(list "--without-icondir"
+ "--without-languages"
+ "--without-menudir")
+ ;; Seven tests fail, mostly because of files that are provided by
the
+ ;; cups-filters package.
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
++ (add-after 'unpack 'update-config-scripts
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (for-each (lambda (file)
+ (install-file
+ (search-input-file
+ (or native-inputs inputs)
+ (string-append "/bin/" file)) "."))
- '("config.guess" "config.sub")))))
- '()))))
++ '("config.guess" "config.sub"))))
+ (add-after 'unpack 'never-cupsAdminGetServerSettings
+ ;; Rather than just ask the daemon, this part of CUPS assumes
+ ;; that (1) it has access to a cupsd.conf under
CUPS_SERVERROOT
+ ;; and (2) the file's contents apply to the running daemon.
+ ;; (1) is false at least on Guix Systems resulting in
extremely
+ ;; long delays when loading the Web interface's /admin page.
+ ;; (2) is never valid: it ignores, e.g., -c FILE. Upstream
+ ;; considers this code on ‘life support’ so just neuter it.
+ (lambda _
+ (substitute* "cgi-bin/admin.c"
+ (("!cupsAdminGetServerSettings" match)
+ (string-append "0 && " match)))))
+ (add-after 'unpack 'remove-Web-UI-server-settings
+ ;; The /admin page's server configuration form is
questionable
+ ;; for the same reason as cupsAdminGetServerSettings, and
won't
+ ;; work at all on Guix Systems. Remove it entirely.
+ (lambda _
+ ;; SUBSTITUTE* & patches both have (dis)advantages. This
is
+ ;; shorter & should ensure that no translation is
forgotten.
+ (substitute* (find-files "templates" "^admin\\.tmpl$")
+ ((" class=\"halves\"") "")
+ (("<FORM.* ACTION=\"/jobs.*</FORM>" match)
+ (string-append match "</P>{BROKEN? "))
+ (("</FORM>}" match)
+ (string-append match "}")))))
+ (add-before 'configure 'patch-makedefs
+ (lambda _
+ (substitute* "Makedefs.in"
+ (("INITDIR.*=.*@INITDIR@") "INITDIR =
@prefix@/@INITDIR@")
+ (("/bin/sh") (which "sh")))))
+ (add-before 'check 'skip-failing-tests
+ (lambda _
+ (substitute* "test/run-stp-tests.sh"
+ ;; The number of error/warning lines differs, probably
due
+ ;; to a missing font. Substitute the last observed
count.
+ (("(\\$count != )33" _ prefix)
+ (string-append prefix "39"))))))))
(native-inputs
- (list pkg-config))
+ (append (if (target-riscv64?)
+ (list config)
+ '())
+ (list pkg-config)))
(inputs
(list zlib gnutls))
- (home-page "https://openprinting.github.io/";)
+ (home-page "https://openprinting.github.io/cups";)
(synopsis "The Common Unix Printing System")
(description
- "CUPS is a printing system that uses the Internet Printing Protocol
-(@dfn{IPP}). It provides System V and BSD command-line interfaces, as well
-as a Web interface and a C programming interface to manage printers and print
-jobs. It supports printing to both local (parallel, serial, USB) and
-networked printers, and printers can be shared from one computer to another.
-Internally, CUPS uses PostScript Printer Description (@dfn{PPD}) files to
-describe printer capabilities and features, and a wide variety of generic and
-device-specific programs to convert and print many types of files.")
+ "CUPS is a printing system that uses @acronym{IPP, the Internet Printing
+Protocol} to talk to printers and network clients. It also provides the old
+@command{lp} and @command{lpr} commands, a Web interface, and a C programming
+interface to manage printers and print jobs.
+
+CUPS can print to both local (USB, serial, even parallel) and networked
+printers. Almost any modern printer supports IPP@tie{}Everywhere, sometimes
+sold as AirPrint, and is supported out of the box. Older printers can be
+supported through legacy PPD-based printer drivers called ``printer
+applications''. These must be installed separately.")
;; CUPS is Apache 2.0 with exceptions, see the NOTICE file.
(license license:asl2.0)))
diff --cc gnu/packages/curl.scm
index f8dc3ce692,bd00a6d274..484937bf0a
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -134,13 -137,39 +134,10 @@@ curl supports SSL certificates, HTTP PO
form based upload, proxies, cookies, file transfer resume, user+password
authentication (Basic, Digest, NTLM, Negotiate, kerberos...), proxy
tunneling, and so on.")
- (license (license:non-copyleft "file://COPYING"
- "See COPYING in the distribution."))
- (home-page "https://curl.haxx.se/";)))
-
-;; Replacement package with fixes for multiple vulnerabilities.
-;; See <https://curl.se/docs/security.html>.
-(define curl-7.84.0
- (package
- (inherit curl)
- (version "7.84.0")
- (source (origin
- (inherit (package-source curl))
- (uri (string-append "https://curl.se/download/curl-";
- version ".tar.xz"))
- (sha256
- (base32
- "1f2xgj0wvys9xw50h7vcbaraavjr9rxx9n06x2xfbgs7ym1qn49d"))
- (patches (append (origin-patches (package-source curl))
- (search-patches "curl-easy-lock.patch")))))
- (arguments (substitute-keyword-arguments (package-arguments curl)
- ((#:phases phases)
- (cond
- ((not (target-64bit?))
- #~(modify-phases #$phases
- (add-after 'unpack 'tweak-lib3026-test
- (lambda _
- ;; Have that test create a hundred threads, not a
- ;; thousand.
- (substitute* "tests/libtest/lib3026.c"
- (("NUM_THREADS .*$")
- "NUM_THREADS 100\n"))))))
- (else phases)))))))
+ (license (license:non-copyleft "file://COPYING"
+ "See COPYING in the distribution."))
+ (home-page "https://curl.haxx.se/";)))
- (define-public curl-minimal
- (deprecated-package "curl-minimal" curl))
-
(define-public curl-ssh
(package/inherit curl
(arguments
diff --cc gnu/packages/databases.scm
index a2bd284659,0f2dce00a1..b37bb255a4
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -5019,3 -5105,84 +5105,84 @@@ generic interface to caching backends o
provides API hooks which integrate these cache backends with the locking
mechanism of @code{dogpile}.")
(license license:expat)))
+
+ (define-public datasette
+ (package
+ (name "datasette")
+ (version "0.64.2")
+ (source (origin
+ (method git-fetch) ;for tests
+ (uri (git-reference
+ (url "https://github.com/simonw/datasette";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1c8ajdaraynrjvsb8xxxnkb7zgm5fwq60qczaz00n465ki80j4h3"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list
+ #:test-flags
+ ;; There are multiple unexplained test failures (see:
+ ;; https://github.com/simonw/datasette/issues/2048).
+ #~(list "-k" (string-append
+ "not (test_database_page_for_database_with_dot_in_name"
+ " or test_row_strange_table_name"
+ " or test_database_with_space_in_name"
+ " or test_tilde_encoded_database_names"
+ " or test_weird_database_names"
+ " or test_css_classes_on_body"
+ " or test_templates_considered"
+ " or test_row_html_compound_primary_key"
+ " or test_edit_sql_link_on_canned_queries"
+ " or test_alternate_url_json"
+ " or test_table_with_slashes_in_name"
+ " or test_searchable"
+ " or test_custom_query_with_unicode_characters"
+ " or test_searchmode)")
+ "-n" (number->string (parallel-job-count))
+ "-m" "not serial") ;cannot run in parallel
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'relax-requirements
+ (lambda _
+ ;; The package needlessly specifies exact versions
+ ;; of dependencies, when it works fine with others.
+ (substitute* "setup.py"
+ (("(black)==[0-9\\.]+" _ package)
+ package)
+ (("click-default-group-wheel")
+ "click-default-group")))))))
+ (propagated-inputs
+ (list python-aiofiles
+ python-asgi-csrf
+ python-asgiref
+ python-click
+ python-click-default-group
+ python-httpx
+ python-hupper
+ python-itsdangerous
+ python-janus
+ python-jinja2
+ python-mergedeep
+ python-pint
+ python-pluggy-next
+ python-pyyaml
+ python-uvicorn))
+ (native-inputs
+ (list python-beautifulsoup4
+ python-black
+ python-cogapp
+ python-pytest-7.1
+ python-pytest-asyncio
+ python-pytest-runner
+ python-pytest-timeout
- python-pytest-xdist-next
++ python-pytest-xdist
+ python-setuptools
+ python-trustme))
+ (home-page "https://datasette.io/";)
+ (synopsis "Multi-tool for exploring and publishing data")
+ (description "Datasette is a tool for exploring and publishing data.
+ It helps people take data of any shape or size and publish that as an
+ interactive, explorable website and accompanying API.")
+ (license license:asl2.0)))
diff --cc gnu/packages/fontutils.scm
index 9d0d23f9c8,fd1784a7e9..7ff56892e7
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -785,12 -755,8 +774,8 @@@ suite of the @code{psautohint} package.
#$(this-package-native-input "psautohint-font-data")
"tests/integration/data")
(for-each make-file-writable
- (find-files "tests/integration/data"))))
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "pytest" "-vv")))))))
- (propagated-inputs (list python-fonttools))
+ (find-files "tests/integration/data")))))))
- (propagated-inputs (list python-fonttools-next))
++ (inputs (list python-fonttools))
(native-inputs
(list psautohint-font-data
python-fs
diff --cc gnu/packages/freedesktop.scm
index 5074ed0807,362c6b308b..3ce304a905
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -27,11 -27,10 +27,11 @@@
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
- ;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer
<maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
-;;; Copyright © 2022 muradm <mail@muradm.net>
+;;; Copyright © 2022 Wamm K. D. <jaft.r@outlook.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
+;;; Copyright © 2022 muradm <mail@muradm.net>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/ghostscript.scm
index 3c85f61d88,dfd43d8ed0..1813cc367e
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -4,10 -4,10 +4,10 @@@
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2013, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
- ;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2017, 2018, 2019, 2021, 2023 Efraim Flashner
<efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018, 2020, 2022 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;;
diff --cc gnu/packages/gnuzilla.scm
index 45f474bee6,c17ce2719e..9b6744088f
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -726,9 -704,11 +724,11 @@@ variable defined below. It requires gu
libxcomposite
libxt
libffi
- ffmpeg
+ ;; Support for FFmpeg 6 was only added in version 112 (see:
+ ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
+ ffmpeg-5
libvpx
- icu4c-71 ;TODO: Change to 'icu4c' when its version is >= 71.
+ icu4c
pixman
pulseaudio
mesa
diff --cc gnu/packages/gstreamer.scm
index 90335c6bb2,0d051438e3..8971c11479
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@@ -469,10 -473,12 +470,11 @@@ the GStreamer multimedia framework."
version ".tar.xz"))
(sha256
(base32
- "0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0"))))
+ "08cfz2vkf494rsg0bn75px26fxs3syvxnsc9lj5n074j0cvfgbxj"))))
(build-system meson-build-system)
(arguments
- (list #:phases
+ (list #:disallowed-references (list python)
- #:meson meson-0.63
+ #:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
#$@(if (string-prefix? "i686" (or (%current-target-system)
@@@ -954,10 -958,11 +951,10 @@@ par compared to the rest."
(string-append "https://gstreamer.freedesktop.org/src/";
name "/" name "-" version ".tar.xz"))
(sha256
- (base32 "1zdfsq0zm1d3wj3w3z44bf3v28clr8yd6qzmkjs09hq9k9w21alc"))))
+ (base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g"))))
(build-system meson-build-system)
(arguments
- (list #:meson meson-0.63
- #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases
#~(modify-phases %standard-phases
#$@%common-gstreamer-phases
@@@ -1012,14 -1017,15 +1009,11 @@@ think twice about shipping them."
"https://gstreamer.freedesktop.org/src/"; name "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1zkxybdzdkn07wwmj0rrgxyvbry472dggjv2chdsmpzwc02x3v9z"))))
+ (base32 "1zfg7giwampmjxkqr5pqy66vck42b0akmwby661brwz8iy3zkapw"))))
(build-system meson-build-system)
- (arguments (list #:meson meson-0.63))
-- (native-inputs
-- (list perl pkg-config python-wrapper ruby))
-- (inputs
-- (list ffmpeg))
-- (propagated-inputs
-- (list gstreamer gst-plugins-base))
++ (native-inputs (list perl pkg-config python-wrapper ruby))
++ (inputs (list ffmpeg))
++ (propagated-inputs (list gstreamer gst-plugins-base))
(synopsis "GStreamer plugins and helper libraries")
(description "Gst-Libav contains a GStreamer plugin for using the
encoders,
decoders, muxers, and demuxers provided by FFmpeg.")
diff --cc gnu/packages/ibus.scm
index de15587cb0,dd15d65105..b815ffd602
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@@ -244,11 -238,29 +238,29 @@@ may also simplify input method developm
(define-public ibus
(package/inherit ibus-minimal
- (arguments (substitute-keyword-arguments (package-arguments ibus-minimal)
- ((#:configure-flags flags)
- #~(cons* "--enable-gtk4" #$flags))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ibus-minimal)
+ ((#:configure-flags flags)
+ #~(cons* "--enable-gtk4"
+ "--enable-python-library"
+ #$flags))
+ ((#:phases phases '%standard-phases)
+ #~(modify-phases #$phases
+ (replace 'wrap-with-additional-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Make sure 'ibus-setup' runs with the correct
+ ;; GUIX_PYTHONPATH and GI_TYPELIB_PATH.
+ (wrap-program (search-input-file outputs "bin/ibus-setup")
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))
+ `("GI_TYPELIB_PATH" ":" prefix
+ (,(getenv "GI_TYPELIB_PATH")
+ ,(string-append #$output
"/lib/girepository-1.0"))))))))))
(inputs (modify-inputs (package-inputs ibus-minimal)
- (prepend gtk pango)))
+ (prepend gtk
- pango-next
++ pango
+ python
+ python-dbus
+ python-pygobject)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin
diff --cc gnu/packages/image-processing.scm
index 85484bb03c,a0227c920c..42bd34bd63
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@@ -402,7 -425,9 +425,9 @@@ many popular formats."
mesa
netcdf
libpng
+ libtiff
+ openmpi
- proj-7
+ proj
python
;("pugixml" ,pugixml)
sqlite
diff --cc gnu/packages/music.scm
index 2b246be758,69fe7009be..23bd358240
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@@ -6351,62 -6436,100 +6436,100 @@@ and as an LV2 plugin."
;; distros to make necessary changes to integrate the software into the
;; distribution.
(name "zrythm")
- (version "1.0.0-alpha.12.0.1")
+ (version "1.0.0-beta.4.5.62")
(source
- (origin
- (method url-fetch)
- (uri (string-append "https://www.zrythm.org/releases/zrythm-";
- version ".tar.xz"))
- (sha256
- (base32
- "1si4n8rdg0a3frlbj6yqpyzr4f20v3cpl4m6kv0yf7r25psyl5pk"))))
- (build-system meson-build-system)
- (arguments
- `(#:glib-or-gtk? #t
- #:configure-flags
- `("-Dtests=true"
- "-Dmanpage=true"
- "-Ddseg_font=false"
- "-Dgraphviz=enabled" ; for exporting routing graphs
- "-Dguile=enabled" ; for Guile scripting
- "-Djack=enabled" ; for JACK audio/MIDI backend
- "-Drtmidi=enabled" ; for RtMidi backend (ALSA sequencer)
- "-Dsdl=enabled"))) ; for SDL audio backend (which uses ALSA)
- (inputs
- `(("alsa-lib" ,alsa-lib)
- ("jack" ,jack-1)
- ("font-dseg" ,font-dseg)
- ("fftw" ,fftw)
- ("fftwf" ,fftwf)
- ("gettext" ,gettext-minimal)
- ("glibc" ,glibc)
- ("graphviz" ,graphviz)
- ("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview-4)
- ("guile" ,guile-2.2)
- ("libaudec" ,libaudec)
- ("libcyaml" ,libcyaml)
- ("libsamplerate" ,libsamplerate)
- ("libsndfile" ,libsndfile)
- ("libyaml" ,libyaml)
- ("lilv" ,lilv)
- ("lv2" ,lv2)
- ("pulseaudio" ,pulseaudio)
- ("reproc" ,reproc)
- ("rubberband" ,rubberband)
- ("rtmidi" ,rtmidi-4.0)
- ("sdl2" ,sdl2)
- ("xdg-utils" ,xdg-utils)
- ("zstd" ,zstd "lib")))
- (native-inputs
- (list pkg-config help2man
- `(,glib "bin"))) ; for 'glib-compile-resources'
- (synopsis "Digital audio workstation focusing on usability")
- (description "Zrythm is a digital audio workstation designed to be
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.zrythm.org/releases/zrythm-";
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1nfb3h3aky8f8xslx6qzvcgcfrhlqa1v50kzanmpjxrx9dcllin7"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:tests? #f ;123 pass, 3 fail. Appears network-related.
+ #:glib-or-gtk? #t
+ #:configure-flags
+ #~(list "-Dtests=true"
+ "-Dmanpage=false" ;fish-completions breaks this
+ "-Ddseg_font=false"
+ "-Dextra_optimizations=false" ;machine-specific
+ "-Dgraphviz=enabled" ;for exporting routing graphs
+ "-Dguile=enabled" ;for Guile scripting
+ "-Djack=enabled" ;for JACK audio/MIDI backend
+ "-Drtmidi=enabled" ;for RtMidi backend (ALSA sequencer)
+ "-Dsdl=enabled") ;for SDL audio backend (which uses ALSA)
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'disable-guile-auto-compilation
+ (lambda _
+ (setenv "GUILE_AUTO_COMPILE" "0")))
+ (add-after 'install 'wrap-program
+ (lambda _
+ (wrap-program (string-append #$output "/bin/zrythm")
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Zrythm to load
+ ;; its own SVG icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))
+ (inputs
+ (list alsa-lib
+ boost
+ carla-2.6
+ curl
+ fftw
+ fftwf
+ flex
+ font-dseg
+ gettext-minimal
+ glib-next
+ glibc
+ graphviz
+ gtk
+ gtksourceview
+ guile-2.2
+ jack-2
+ json-glib
+ libadwaita
+ libaudec
+ (module-ref
+ (resolve-interface '(gnu packages debug)) 'libbacktrace)
+ libcyaml
+ libpanel
+ (librsvg-for-system)
+ libsamplerate
+ libsndfile
+ libyaml
+ lilv
+ lv2
- pango-next
++ pango
+ pipewire
+ pulseaudio
+ reproc
+ rtmidi
+ rubberband
+ sdl2
+ vamp
+ xdg-utils
+ xxhash
+ zix
+ `(,zstd "lib")))
+ (native-inputs
+ ;; Zrythm require breeze-icons to be installed. Having them listed in
+ ;; the native inputs cause them to be wrapped and made available via
+ ;; XDG_DATA_DIRS.
+ (list breeze-icons ;native because not executable
+ help2man
+ `(,glib-next "bin") ;for 'glib-compile-resources'
+ pkg-config
+ python-sphinx
+ python-sphinx-intl
+ sassc))
+ (synopsis "Digital audio workstation focusing on usability")
+ (description "Zrythm is a digital audio workstation designed to be
featureful and easy to use. It offers unlimited automation options, LV2
plugin support, JACK support and chord assistance.")
- (home-page "https://www.zrythm.org";)
- (license license:agpl3+)))
+ (home-page "https://www.zrythm.org/en/index.html";)
+ (license license:agpl3+)))
(define-public dragonfly-reverb
(package
diff --cc gnu/packages/node.scm
index 43a37e85ec,6137ed1dd3..d8d40e8fb4
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@@ -885,9 -885,8 +885,8 @@@ source files."
libuv-for-node
llhttp-bootstrap
brotli
- `(,nghttp2 "lib")
+ `(,nghttp2-for-node "lib")
openssl-1.1
- python-wrapper ;; for node-gyp (supports python3)
zlib))))
(define-public libnode
diff --cc gnu/packages/pdf.scm
index 48420c730f,17637af0f6..4a43b97d39
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -20,7 -20,7 +20,7 @@@
;;; Copyright © 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
--;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
++;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
diff --cc gnu/packages/qt.scm
index acf2d70736,8cda634cef..c3722549cc
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -1187,15 -1184,16 +1190,16 @@@ XML and custom data models. It contain
xmlpatternsvalidator.")))
(define-public qtdeclarative-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtdeclarative")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests
@@@ -1368,15 -1362,16 +1368,16 @@@ integrate QML code with JavaScript and
(license (package-license qtbase))))
(define-public qtconnectivity
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtconnectivity")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc"))))
(native-inputs
(list perl pkg-config qtdeclarative-5))
(inputs
@@@ -1448,18 -1443,19 +1449,19 @@@ consume data received from the server,
(license (package-license qtbase))))
(define-public qtsensors
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtsensors")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:parallel-tests? _ #f) #f) ; can lead to race condition
+ ((#:parallel-tests? _ #f) #f) ; can lead to race condition
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'fix-tests
@@@ -1479,21 -1475,21 +1481,21 @@@ recognition API for devices."))
(package
(inherit qtsvg-5)
(name "qtmultimedia")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk"))
+ (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") "#"))))))
+ ;; We also prevent the spectrum example from being built.
+ (substitute* "examples/multimedia/multimedia.pro"
+ (("spectrum") "#"))))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@@ -1615,18 -1611,19 +1617,19 @@@ set of plugins for interacting with pul
(license (package-license qtbase))))
(define-public qtwayland-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtwayland")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (patches (search-patches "qtwayland-gcc-11.patch"
-
"qtwayland-dont-recreate-callbacks.patch"
- "qtwayland-cleanup-callbacks.patch"))
- (sha256
- (base32
- "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (patches (search-patches "qtwayland-gcc-11.patch"
+
"qtwayland-dont-recreate-callbacks.patch"
+ "qtwayland-cleanup-callbacks.patch"))
+ (sha256
+ (base32
+ "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@@ -1715,18 -1711,18 +1717,18 @@@ compositor libraries."
(license (package-license qtbase))))
(define-public qtserialport
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtserialport")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v"))))
(native-inputs (list perl))
- (inputs
- (list qtbase-5 eudev))
+ (inputs (list qtbase-5 eudev))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@@ -1744,15 -1742,16 +1748,16 @@@
interacting with serial ports from within Qt.")))
(define-public qtserialbus
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtserialbus")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases '%standard-phases)
@@@ -1829,15 -1825,16 +1831,16 @@@ application)."
(license (package-license qtbase))))
(define-public qtwebglplugin
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtwebglplugin")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@@ -1857,46 -1854,44 +1860,44 @@@ compatible web browser without the use
OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(define-public qtwebview
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtwebview")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj"))))
- (native-inputs
- (list perl))
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj"))))
+ (native-inputs (list perl))
+ (inputs (list qtbase-5 qtdeclarative-5))
(synopsis "Display web content in a QML application")
(description "Qt WebView provides a way to display web content in a QML
application without necessarily including a full web browser stack by using
native APIs where it makes sense.")))
(define-public qtlocation
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtlocation")
- (version "5.15.5")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0r16qxy0pfpwvna4gpz67jk3qv3qizfd659kc9iwdh8bhz7lpjrw"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
- "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
++ "0r16qxy0pfpwvna4gpz67jk3qv3qizfd659kc9iwdh8bhz7lpjrw"))))
(arguments
(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-5 qtquickcontrols-5 qtserialport))
- (inputs
- (list icu4c openssl qtbase-5 zlib))
+ #~(modify-phases #$phases
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" "/tmp")))))))
+ (native-inputs (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.")))
@@@ -1934,22 -1929,21 +1935,21 @@@ plugin for Adobe After Effects."
(license (package-license qtbase))))
(define-public qttools-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qttools")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (native-inputs
- (list perl qtdeclarative-5 vulkan-headers))
- (inputs
- (list mesa qtbase-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (native-inputs (list perl qtdeclarative-5 vulkan-headers))
+ (inputs (list mesa qtbase-5))
(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
@@@ -2017,60 -2011,59 +2017,59 @@@ the Qt community."
(license (list license:gpl3))))
(define-public qtscript
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtscript")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs"))
- (patches (search-patches "qtscript-disable-tests.patch"))))
- (native-inputs
- (list perl qttools-5))
- (inputs
- (list qtbase-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs"))
+ (patches (search-patches "qtscript-disable-tests.patch"))))
+ (native-inputs (list perl qttools-5))
+ (inputs (list qtbase-5))
(synopsis "Qt Script module")
(description "Qt provides support for application scripting with
ECMAScript.
The following guides and references cover aspects of programming with
ECMAScript and Qt.")))
(define-public qtquickcontrols-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtquickcontrols")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (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-5
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtquickcontrols2")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (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,
@@@ -2084,20 -2077,20 +2083,20 @@@ not available."))
(deprecated-package "qtquickcontrols2" qtdeclarative))
(define-public qtgraphicaleffects
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtgraphicaleffects")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (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.
@@@ -2107,17 -2100,17 +2106,18 @@@ types. The effects cover functional ar
coloring, and many more.")))
(define-public qtgamepad
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtgamepad")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
- (native-inputs (list perl pkg-config))
+ (native-inputs
+ (list perl pkg-config))
(inputs
(list fontconfig
freetype
@@@ -2133,27 -2126,26 +2133,26 @@@ primary target audience are embedded de
and mobile applications targeting TV-like form factors.")))
(define-public qtscxml
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtscxml")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "tests/3rdparty")
- ;; the scion test refers to the bundled 3rd party test code.
- (substitute* "tests/auto/auto.pro"
- (("scion") "#"))))))
- (arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5 qtdeclarative-5))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "tests/3rdparty")
+ ;; the scion test refers to the bundled 3rd party test code.
+ (substitute* "tests/auto/auto.pro"
+ (("scion") "#"))))))
+ (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs (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
@@@ -2192,31 -2184,32 +2191,33 @@@ information and perform area based moni
(license (package-license qtbase))))
(define-public qtpurchasing
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtpurchasing")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
- (inputs (list qtbase-5 qtdeclarative-5))
+ (inputs
+ (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-5)
+ (package
+ (inherit qtsvg-5)
(name "qtcharts")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
@@@ -2237,20 -2229,19 +2237,21 @@@ selecting one of the charts themes."
(license license:gpl3)))
(define-public qtdatavis3d
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtdatavis3d")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh"))))
- (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs (list qtbase-5 qtdeclarative-5))
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (inputs
+ (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
@@@ -2325,25 -2318,25 +2328,26 @@@ implementation of OAuth and OAuth2 auth
(description "The Qt Remote Objects module is an @dfn{inter-process
communication} (IPC) module developed for Qt. The idea is to extend existing
Qt's functionalities to enable an easy exchange of information between
- processes or computers.")))
+ processes or computers.")
+ (home-page (package-home-page qtbase))
+ (license (package-license qtbase))))
(define-public qtspeech
- (package (inherit qtsvg-5)
+ (package
+ (inherit qtsvg-5)
(name "qtspeech")
- (version "5.15.8")
+ (version %qt-version)
(source (origin
- (method url-fetch)
- (uri (qt-urls name version))
- (sha256
- (base32
- "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6"))))
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6"))))
- (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
- (inputs
- (list qtbase-5))
- (native-inputs
- (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
+ (inputs (list qtbase-5))
+ (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
(synopsis "Qt Speech module")
(description "The Qt Speech module enables a Qt application to support
accessibility features such as text-to-speech, which is useful for end-users
diff --cc gnu/packages/ruby.scm
index 595aa1c974,834c0dfbd4..feb78731c2
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@@ -5225,23 -6440,23 +6440,19 @@@ across multiple CPU cores."
(define-public ruby-parser
(package
(name "ruby-parser")
- (version "3.1.0.0")
- (version "3.2.1.1")
++ (version "3.2.2.0")
(source
(origin
(method url-fetch)
(uri (rubygems-uri "parser" version))
(sha256
(base32
- "08q20ckhn58m49lccf93p0yv7pkc7hymmcz3di762kb658d5fd38"))))
- "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc"))))
++ "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx"))))
(build-system ruby-build-system)
-- (arguments
-- '(#:tests? #f)) ; tests not included in gem
-- (native-inputs
-- (list bundler ruby-cliver ruby-simplecov ruby-racc))
-- (inputs
-- (list ragel))
-- (propagated-inputs
-- (list ruby-ast))
++ (arguments '(#:tests? #f)) ; tests not included in gem
++ (native-inputs (list bundler ruby-cliver ruby-simplecov ruby-racc))
++ (inputs (list ragel))
++ (propagated-inputs (list ruby-ast))
(synopsis "Ruby parser written in pure Ruby")
(description
"This package provides a Ruby parser written in pure Ruby.")
diff --cc gnu/packages/tex.scm
index 7abf7f93da,0257bb89a6..e755b8d715
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -6,9 -6,9 +6,9 @@@
;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner
<efraim@flashner.co.il>
;;; Copyright © 2016 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
- ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus
<rekado@elephly.net>
+ ;;; Copyright © 2016-2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2017, 2020, 2021 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2017, 2020-2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Danny Milosavljevic <dannym+a@scratchpost.org>
;;; Copyright © 2018, 2020 Arun Isaac <arunisaac@systemreboot.net>
@@@ -3246,8 -3298,22 +3335,24 @@@ verbatim mode; build \"example\" enviro
verbatim source).")
(license license:lppl1.0+)))
+(define-deprecated-package texlive-latex-fancyvrb texlive-fancyvrb)
+
+ (define-public texlive-glyphlist
+ (package
+ (inherit (simple-texlive-package
+ "texlive-glyphlist"
+ (list "fonts/map/glyphlist/")
+ (base32
+ "12nmmyh77vr2622lzi11nm1z1k2bxs7jz018yl4rwjlpg0sxg1ja")
+ #:trivial? #t))
+ (home-page "https://www.tug.org/texlive/";)
+ (synopsis "Adobe glyph list and TeX extensions")
+ (description
+ "This package provides a map between traditional Adobe glyph names and
+ Unicode points; it is maintained by Adobe. The additional
+ @file{texglyphlist.txt} is maintained as part of lcdf-typetools.")
+ (license license:asl2.0)))
+
(define-public texlive-graphics-def
(package
(inherit (simple-texlive-package
diff --cc gnu/packages/webkit.scm
index 8ef95ce518,e5eafcb142..815105800b
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@@ -290,7 -292,8 +292,7 @@@ propagated by default) such as @code{gs
(replace "gtk+" gtk)))
(inputs
(modify-inputs (package-inputs webkitgtk)
- (delete "gtk+-2" "libnotify")))))
- (delete "libnotify")
- (append pango-next))))) ;TODO: remove after it's the default
++ (delete "libnotify")))))
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
diff --cc gnu/packages/wm.scm
index c480f68aa6,a6bca5dee1..cd0c122fca
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -133,7 -131,7 +133,8 @@@
#:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages mpd)
+ #:use-module (gnu packages pciutils)
+ #:use-module (gnu packages music)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)