[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'savannah/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'savannah/master' into core-updates |
|
Date: |
Thu, 2 Mar 2023 06:10:03 -0500 (EST) |
cbaines pushed a commit to branch core-updates
in repository guix.
commit 7df09ee0ab3e7962ef27859ce87e06a323059284
Merge: 2ac51ec99b af95f2d8f9
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Mar 2 10:37:28 2023 +0000
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/autotools.scm
gnu/packages/cmake.scm
gnu/packages/gnuzilla.scm
gnu/packages/haskell.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/samba.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/wxwidgets.scm
.dir-locals.el | 6 +-
.patman | 1 +
Makefile.am | 4 +
doc/guix.texi | 620 +-
etc/guix-install.sh | 25 +-
etc/news.scm | 45 +-
etc/release-manifest.scm | 2 +-
etc/snippets/yas/scheme-mode/guix-news-entry | 9 +
etc/teams.scm.in | 17 +-
gnu/build/linux-container.scm | 17 +-
gnu/home/services/fontutils.scm | 18 +-
gnu/local.mk | 41 +-
gnu/packages/abiword.scm | 1 -
gnu/packages/accessibility.scm | 47 +-
gnu/packages/ada.scm | 6 -
gnu/packages/admin.scm | 160 +-
gnu/packages/agda.scm | 6 +-
gnu/packages/algebra.scm | 14 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/apl.scm | 44 +
gnu/packages/apr.scm | 4 +-
gnu/packages/aspell.scm | 14 +-
gnu/packages/assembly.scm | 4 +-
gnu/packages/astronomy.scm | 134 +-
gnu/packages/audio.scm | 174 +-
gnu/packages/authentication.scm | 2 +-
gnu/packages/autotools.scm | 2 +-
gnu/packages/aux-files/emacs/guix-emacs.el | 7 +
gnu/packages/aux-files/linux-libre/4.14-i686.conf | 2 +-
.../aux-files/linux-libre/4.14-x86_64.conf | 2 +-
gnu/packages/aux-files/linux-libre/4.19-i686.conf | 2 +-
.../aux-files/linux-libre/4.19-x86_64.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.10-arm.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.10-arm64.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.10-i686.conf | 2 +-
.../aux-files/linux-libre/5.10-x86_64.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.15-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.15-arm64.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.15-i686.conf | 4 +-
.../aux-files/linux-libre/5.15-x86_64.conf | 4 +-
gnu/packages/aux-files/linux-libre/5.4-arm.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.4-i686.conf | 2 +-
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 2 +-
gnu/packages/aux-files/linux-libre/6.1-arm.conf | 4 +-
gnu/packages/aux-files/linux-libre/6.1-arm64.conf | 4 +-
gnu/packages/aux-files/linux-libre/6.1-i686.conf | 4 +-
gnu/packages/aux-files/linux-libre/6.1-x86_64.conf | 4 +-
gnu/packages/backup.scm | 29 +-
gnu/packages/barrier.scm | 1 -
gnu/packages/base.scm | 3 +-
gnu/packages/bdw-gc.scm | 12 +-
gnu/packages/bioconductor.scm | 604 +-
gnu/packages/bioinformatics.scm | 882 +-
gnu/packages/bittorrent.scm | 6 +-
gnu/packages/bootloaders.scm | 20 +-
gnu/packages/bootstrap.scm | 1 -
gnu/packages/bqn.scm | 1 -
gnu/packages/build-tools.scm | 5 +-
gnu/packages/busybox.scm | 6 +-
gnu/packages/c.scm | 11 +-
gnu/packages/cdrom.scm | 8 +-
gnu/packages/check.scm | 176 +-
gnu/packages/chemistry.scm | 3 +-
gnu/packages/chez.scm | 13 +-
gnu/packages/cmake.scm | 17 +
gnu/packages/code.scm | 20 +-
gnu/packages/commencement.scm | 2 +-
gnu/packages/compression.scm | 27 +-
gnu/packages/configuration-management.scm | 2 +-
gnu/packages/containers.scm | 49 +-
gnu/packages/coq.scm | 1 -
gnu/packages/cpp.scm | 25 +-
gnu/packages/cran.scm | 1708 ++-
gnu/packages/crates-io.scm | 305 +-
gnu/packages/cross-base.scm | 1 -
gnu/packages/crypto.scm | 4 +-
gnu/packages/cups.scm | 36 +-
gnu/packages/curl.scm | 8 +-
gnu/packages/databases.scm | 20 +-
gnu/packages/datastructures.scm | 51 +
gnu/packages/debian.scm | 22 +-
gnu/packages/debug.scm | 39 +-
gnu/packages/dhall.scm | 168 +-
gnu/packages/dictionaries.scm | 6 +-
gnu/packages/disk.scm | 10 +-
gnu/packages/django.scm | 2 +-
gnu/packages/djvu.scm | 4 +-
gnu/packages/dns.scm | 140 +-
gnu/packages/docbook.scm | 4 +-
gnu/packages/docker.scm | 82 +
gnu/packages/documentation.scm | 2 +-
gnu/packages/ebook.scm | 6 +-
gnu/packages/education.scm | 8 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/elm.scm | 5 +-
gnu/packages/emacs-xyz.scm | 1211 +-
gnu/packages/emacs.scm | 74 +-
gnu/packages/embedded.scm | 2 +-
gnu/packages/emulators.scm | 58 +-
gnu/packages/engineering.scm | 104 +-
gnu/packages/enlightenment.scm | 145 +-
gnu/packages/erlang.scm | 6 +-
gnu/packages/fabric-management.scm | 102 +-
gnu/packages/file-systems.scm | 40 +-
gnu/packages/finance.scm | 339 +-
gnu/packages/firmware.scm | 9 +
gnu/packages/flashing-tools.scm | 4 +-
gnu/packages/fltk.scm | 2 +-
gnu/packages/fonts.scm | 70 +-
gnu/packages/fontutils.scm | 6 +-
gnu/packages/fpga.scm | 155 +-
gnu/packages/freedesktop.scm | 13 +-
gnu/packages/ftp.scm | 2 +-
gnu/packages/game-development.scm | 12 +-
gnu/packages/games.scm | 96 +-
gnu/packages/gcc.scm | 12 +-
gnu/packages/gd.scm | 21 +-
gnu/packages/geo.scm | 54 +-
gnu/packages/ghostscript.scm | 1 -
gnu/packages/gimp.scm | 13 +
gnu/packages/gl.scm | 31 +-
gnu/packages/gnome-xyz.scm | 134 +-
gnu/packages/gnome.scm | 129 +-
gnu/packages/gnunet.scm | 54 +-
gnu/packages/gnustep.scm | 6 +-
gnu/packages/gnuzilla.scm | 604 +-
gnu/packages/golang.scm | 846 +-
gnu/packages/graph.scm | 39 +-
gnu/packages/graphics.scm | 269 +-
gnu/packages/graphviz.scm | 6 +-
gnu/packages/gstreamer.scm | 28 +-
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile-xyz.scm | 88 +-
gnu/packages/guile.scm | 6 +-
gnu/packages/hardware.scm | 23 +-
gnu/packages/haskell-apps.scm | 627 +-
gnu/packages/haskell-check.scm | 784 +-
gnu/packages/haskell-crypto.scm | 352 +-
gnu/packages/haskell-web.scm | 1456 ++-
gnu/packages/haskell-xyz.scm | 11623 ++++++++++---------
gnu/packages/haskell.scm | 39 +-
gnu/packages/hexedit.scm | 4 +-
gnu/packages/hunspell.scm | 14 +-
gnu/packages/ibus.scm | 33 +-
gnu/packages/idris.scm | 14 +-
gnu/packages/image-processing.scm | 2 +-
gnu/packages/image-viewers.scm | 34 +-
gnu/packages/image.scm | 161 +-
gnu/packages/instrumentation.scm | 28 +
gnu/packages/irc.scm | 76 +
gnu/packages/jami.scm | 120 +-
gnu/packages/java-bootstrap.scm | 4 +-
gnu/packages/java-maths.scm | 1 -
gnu/packages/java-xml.scm | 6 +-
gnu/packages/java.scm | 36 +-
gnu/packages/javascript.scm | 6 +-
gnu/packages/jemalloc.scm | 2 +-
gnu/packages/julia-jll.scm | 118 +
gnu/packages/julia-xyz.scm | 138 +-
gnu/packages/julia.scm | 15 +-
gnu/packages/kde-frameworks.scm | 124 +-
gnu/packages/kde-games.scm | 2 +-
gnu/packages/kde-internet.scm | 2 +-
gnu/packages/kde-plasma.scm | 1 -
gnu/packages/kde-systemtools.scm | 4 +-
gnu/packages/kde.scm | 1 +
gnu/packages/key-mon.scm | 28 -
gnu/packages/kodi.scm | 2 +-
gnu/packages/language.scm | 5 +-
gnu/packages/lego.scm | 2 +-
gnu/packages/lesstif.scm | 42 +-
gnu/packages/libcanberra.scm | 2 +-
gnu/packages/libdaemon.scm | 2 +-
gnu/packages/libffi.scm | 2 +-
gnu/packages/libreoffice.scm | 29 +-
gnu/packages/libusb.scm | 38 +-
gnu/packages/linphone.scm | 4 +-
gnu/packages/linux.scm | 171 +-
gnu/packages/lisp-check.scm | 4 +-
gnu/packages/lisp-xyz.scm | 990 +-
gnu/packages/lisp.scm | 139 +-
gnu/packages/llvm.scm | 9 +-
gnu/packages/logging.scm | 2 +-
gnu/packages/lua.scm | 4 +-
gnu/packages/lxqt.scm | 22 +-
gnu/packages/machine-learning.scm | 61 +-
gnu/packages/mail.scm | 122 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 197 +-
gnu/packages/matrix.scm | 37 +-
gnu/packages/mcrypt.scm | 6 +-
gnu/packages/mes.scm | 6 +-
gnu/packages/messaging.scm | 112 +-
gnu/packages/minetest.scm | 3 +-
gnu/packages/moe.scm | 6 +-
gnu/packages/mold.scm | 123 +
gnu/packages/monitoring.scm | 7 +-
gnu/packages/mp3.scm | 14 +-
gnu/packages/mpd.scm | 116 +-
gnu/packages/mpi.scm | 211 +-
gnu/packages/multiprecision.scm | 2 +-
gnu/packages/music.scm | 576 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncdu.scm | 8 +-
gnu/packages/ncurses.scm | 2 +-
gnu/packages/netpbm.scm | 2 +-
gnu/packages/networking.scm | 128 +-
gnu/packages/nfs.scm | 3 -
gnu/packages/node-xyz.scm | 2 +-
gnu/packages/nss.scm | 38 +-
gnu/packages/ntp.scm | 2 +-
gnu/packages/ocaml.scm | 973 +-
gnu/packages/ocr.scm | 1 -
gnu/packages/opencl.scm | 19 +-
gnu/packages/orange.scm | 2 +-
gnu/packages/package-management.scm | 53 +-
gnu/packages/parallel.scm | 8 +-
gnu/packages/patches/azr3-remove-lash.patch | 191 +
gnu/packages/patches/azr3.patch | 12 +-
.../bees-beesd-honor-destdir-on-installation.patch | 40 -
.../cabal-install-base16-bytestring1.0.patch | 29 -
gnu/packages/patches/cabal-install-ghc8.10.patch | 393 -
gnu/packages/patches/ddclient-skip-test.patch | 43 +
gnu/packages/patches/elm-ghc9.2.patch | 187 +
.../patches/emacs-pasp-mode-quote-file-names.patch | 20 +
gnu/packages/patches/esmini-no-clutter-log.patch | 30 +
gnu/packages/patches/esmini-use-pkgconfig.patch | 541 +
.../patches/ghc-9.2-glibc-2.33-link-order.patch | 35 +
gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch | 303 +
.../patches/ghc-bytestring-handle-ghc9.patch | 67 +
gnu/packages/patches/icecat-makeicecat.patch | 10 +-
.../patches/jami-libjami-headers-search.patch | 18 +-
gnu/packages/patches/ngless-unliftio.patch | 66 -
.../patches/onionshare-cli-async-mode.patch | 25 +
.../patches/opencascade-oce-glibc-2.26.patch | 62 -
.../patches/opentaxsolver-file-browser-fix.patch | 58 +
gnu/packages/patches/php-bug-74093-test.patch | 48 -
gnu/packages/patches/php-curl-compat.patch | 17 -
.../patches/php-fix-streams-copy-length.patch | 52 +
gnu/packages/patches/qpdfview-qt515-compat.patch | 17 -
.../qtwebkit-fix-building-with-bison-3.7.patch | 54 -
.../qtwebkit-fix-building-with-glib-2.68.patch | 21 -
.../qtwebkit-fix-building-with-icu-68.patch | 152 -
.../qtwebkit-fix-building-with-python-3.9.patch | 35 -
.../patches/qtwebkit-pbutils-include.patch | 15 -
.../patches/racket-backport-8.7-pkg-strip.patch | 90 -
.../patches/scsh-nonstring-search-path.patch | 15 +
gnu/packages/patches/spice-vdagent-glib-2.68.patch | 112 -
.../patches/virglrenderer-CVE-2017-6386.patch | 54 -
.../patches/wpa-supplicant-dbus-group-policy.patch | 23 +
.../patches/xf86-video-qxl-fix-build.patch | 101 -
.../patches/xf86-video-tga-remove-mibstore.patch | 34 -
.../patches/xf86-video-voodoo-pcitag.patch | 34 -
gnu/packages/patches/xmonad-dynamic-linking.patch | 24 +-
.../patches/xmonad-next-dynamic-linking.patch | 16 -
gnu/packages/pdf.scm | 68 +-
gnu/packages/perl.scm | 32 +-
gnu/packages/photo.scm | 6 +-
gnu/packages/php.scm | 56 +-
gnu/packages/plan9.scm | 2 +-
gnu/packages/plotutils.scm | 8 +-
gnu/packages/popt.scm | 4 +-
gnu/packages/profiling.scm | 4 +-
gnu/packages/pulseaudio.scm | 2 +-
gnu/packages/purescript.scm | 172 +-
gnu/packages/python-check.scm | 67 +-
gnu/packages/python-web.scm | 52 +-
gnu/packages/python-xyz.scm | 316 +-
gnu/packages/python.scm | 25 +-
gnu/packages/qt.scm | 164 +-
gnu/packages/racket.scm | 46 +-
gnu/packages/radio.scm | 24 +-
gnu/packages/raspberry-pi.scm | 2 +-
gnu/packages/rdf.scm | 6 +-
gnu/packages/regex.scm | 2 +-
gnu/packages/robotics.scm | 1 -
gnu/packages/rsync.scm | 2 +-
gnu/packages/ruby.scm | 20 +-
gnu/packages/rust.scm | 1 -
gnu/packages/samba.scm | 6 +-
gnu/packages/scheme.scm | 138 +-
gnu/packages/screen.scm | 2 +-
gnu/packages/scsi.scm | 2 +-
gnu/packages/sdl.scm | 4 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/shells.scm | 10 +-
gnu/packages/shellutils.scm | 4 +-
gnu/packages/simulation.scm | 109 +-
gnu/packages/smalltalk.scm | 2 +-
gnu/packages/speech.scm | 2 +-
gnu/packages/spice.scm | 234 +-
gnu/packages/ssh.scm | 90 +-
gnu/packages/stalonetray.scm | 2 +-
gnu/packages/statistics.scm | 217 +-
gnu/packages/sugar.scm | 276 +-
gnu/packages/swig.scm | 2 +-
gnu/packages/sync.scm | 32 +-
gnu/packages/syncthing.scm | 1 -
gnu/packages/syndication.scm | 1 -
gnu/packages/task-management.scm | 2 +-
gnu/packages/tcl.scm | 6 +-
gnu/packages/telegram.scm | 1 -
gnu/packages/terminals.scm | 47 +-
gnu/packages/tex.scm | 128 +-
gnu/packages/texinfo.scm | 25 +-
gnu/packages/text-editors.scm | 88 +-
gnu/packages/textutils.scm | 23 +-
gnu/packages/tls.scm | 9 +-
gnu/packages/tor.scm | 25 +-
gnu/packages/tree-sitter.scm | 475 +
gnu/packages/tv.scm | 2 +-
gnu/packages/unicode.scm | 2 +-
gnu/packages/upnp.scm | 2 +-
gnu/packages/valgrind.scm | 22 +-
gnu/packages/version-control.scm | 72 +-
gnu/packages/video.scm | 100 +-
gnu/packages/vim.scm | 11 +-
gnu/packages/virtualization.scm | 12 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/vulkan.scm | 13 +-
gnu/packages/w3m.scm | 6 +-
gnu/packages/web-browsers.scm | 17 +-
gnu/packages/web.scm | 128 +-
gnu/packages/webkit.scm | 7 +-
gnu/packages/wine.scm | 320 +-
gnu/packages/wm.scm | 425 +-
gnu/packages/wv.scm | 2 +-
gnu/packages/wxwidgets.scm | 49 +-
gnu/packages/xdisorg.scm | 120 +-
gnu/packages/xfce.scm | 47 +-
gnu/packages/xfig.scm | 4 +-
gnu/packages/xml.scm | 14 +-
gnu/packages/xorg.scm | 343 +-
gnu/packages/zig-xyz.scm | 2 +-
gnu/packages/zig.scm | 95 +-
gnu/services/audio.scm | 902 +-
gnu/services/base.scm | 87 +-
gnu/services/configuration.scm | 3 +
gnu/services/desktop.scm | 107 +-
gnu/services/guix.scm | 85 +-
gnu/services/lightdm.scm | 2 +-
gnu/services/monitoring.scm | 6 +-
gnu/services/networking.scm | 64 +-
gnu/services/telephony.scm | 8 +-
gnu/system.scm | 58 +-
gnu/system/shadow.scm | 3 +
gnu/tests/audio.scm | 53 +-
gnu/tests/ganeti.scm | 26 +-
guix/build-system/cargo.scm | 1 +
guix/build-system/copy.scm | 1 +
guix/build-system/dune.scm | 1 +
guix/build-system/font.scm | 1 +
guix/build-system/guile.scm | 2 +
guix/build-system/haskell.scm | 5 +-
guix/build-system/meson.scm | 13 +-
guix/build-system/ocaml.scm | 1 +
guix/build-system/ruby.scm | 1 +
guix/build-system/scons.scm | 1 +
guix/build-system/texlive.scm | 1 +
guix/build-system/tree-sitter.scm | 195 +
guix/build-system/waf.scm | 1 +
guix/build/haskell-build-system.scm | 136 +-
guix/build/syscalls.scm | 8 +-
guix/build/tree-sitter-build-system.scm | 153 +
guix/channels.scm | 9 +-
guix/cpio.scm | 10 +-
guix/download.scm | 6 +-
guix/git.scm | 26 +-
guix/import/cran.scm | 66 +-
guix/import/hackage.scm | 21 +-
guix/import/stackage.scm | 6 +-
guix/licenses.scm | 2 +-
guix/progress.scm | 45 +-
guix/rpm.scm | 630 +
guix/scripts.scm | 4 +-
guix/scripts/build.scm | 18 +-
guix/scripts/container/exec.scm | 10 +-
guix/scripts/describe.scm | 6 +-
guix/scripts/environment.scm | 4 +-
guix/scripts/home.scm | 8 +-
guix/scripts/home/edit.scm | 6 +-
guix/scripts/import.scm | 5 +-
guix/scripts/offload.scm | 7 +-
guix/scripts/pack.scm | 564 +-
guix/scripts/package.scm | 6 +-
guix/scripts/pull.scm | 6 +-
guix/scripts/repl.scm | 1 +
guix/scripts/shell.scm | 10 +-
guix/scripts/system.scm | 9 +-
guix/scripts/system/edit.scm | 6 +-
guix/ssh.scm | 2 +-
guix/status.scm | 18 +-
guix/ui.scm | 49 +-
guix/utils.scm | 8 +
po/packages/POTFILES.in | 1 -
tests/containers.scm | 53 +-
tests/guix-pack-relocatable.sh | 6 +-
tests/guix-pack.sh | 5 +-
tests/hackage.scm | 5 +
tests/pack.scm | 368 +-
tests/rpm.scm | 86 +
402 files changed, 27223 insertions(+), 15737 deletions(-)
diff --cc gnu/local.mk
index 19a714c12c,69781a0b8b..6888396095
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -937,9 -941,9 +939,8 @@@ dist_patch_DATA =
%D%/packages/patches/bsd-games-prevent-name-collisions.patch \
%D%/packages/patches/bsd-games-stdio.h.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \
- %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/bidiv-update-fribidi.patch \
- %D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \
%D%/packages/patches/binutils-boot-2.20.1a.patch \
%D%/packages/patches/binutils-loongson-workaround.patch \
%D%/packages/patches/binutils-mingw-w64-timestamp.patch \
@@@ -1186,10 -1197,11 +1190,13 @@@
%D%/packages/patches/gemmi-fix-sajson-types.patch \
%D%/packages/patches/genimage-mke2fs-test.patch \
%D%/packages/patches/geoclue-config.patch \
+ %D%/packages/patches/gettext-libunicode-update.patch \
%D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
+ %D%/packages/patches/ghc-9.2-glibc-2.33-link-order.patch \
%D%/packages/patches/ghc-testsuite-dlopen-pie.patch \
+ %D%/packages/patches/ghc-testsuite-grep-compat.patch \
+ %D%/packages/patches/ghc-bloomfilter-ghc9.2.patch \
+ %D%/packages/patches/ghc-bytestring-handle-ghc9.patch \
%D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \
%D%/packages/patches/ghostscript-no-header-id.patch \
%D%/packages/patches/ghostscript-no-header-uuid.patch \
@@@ -1592,13 -1606,8 +1599,12 @@@
%D%/packages/patches/openboardview-use-system-imgui.patch \
%D%/packages/patches/openboardview-use-system-utf8.patch \
%D%/packages/patches/openbox-python3.patch \
- %D%/packages/patches/opencascade-oce-glibc-2.26.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \
+ %D%/packages/patches/openjdk-9-hotspot-pointer-comparison.patch \
+ %D%/packages/patches/openjdk-9-hotspot-stack-size.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
+ %D%/packages/patches/openjdk-10-hotspot-pointer-comparison.patch \
+ %D%/packages/patches/openjdk-10-hotspot-stack-size.patch \
%D%/packages/patches/openjdk-15-xcursor-no-dynamic.patch \
%D%/packages/patches/openmpi-mtl-priorities.patch \
%D%/packages/patches/openssh-hurd.patch \
@@@ -1619,6 -1629,10 +1626,8 @@@
%D%/packages/patches/pam-krb5-CVE-2020-10595.patch \
%D%/packages/patches/pango-skip-libthai-test.patch \
%D%/packages/patches/password-store-tree-compat.patch \
- %D%/packages/patches/pciutils-hurd-configure.patch \
- %D%/packages/patches/pciutils-hurd-fix.patch \
+ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch
\
+ %D%/packages/patches/php-fix-streams-copy-length.patch \
%D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \
%D%/packages/patches/pocketfft-cpp-prefer-preprocessor-if.patch
\
%D%/packages/patches/pokerth-boost.patch \
diff --cc gnu/packages/autotools.scm
index 49f4865026,006a9e202b..14fa42eefa
--- a/gnu/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@@ -205,27 -203,31 +205,27 @@@ know anything about Autoconf or M4."
use our own Bash instead of /bin/sh in shebangs. For that reason, it should
only be used internally---users should not end up distributing `configure'
files with a system-specific shebang."
- (package (inherit autoconf)
+ (package
+ (inherit autoconf)
(name (string-append (package-name autoconf) "-wrapper"))
(build-system trivial-build-system)
- (inputs `(("guile"
- ;; XXX: Kludge to hide the circular dependency.
- ,(module-ref (resolve-interface '(gnu packages guile))
- 'guile-3.0/pinned))
- ("autoconf" ,autoconf)
- ("bash" ,bash-minimal)))
+ (inputs
+ (list
+ ;; XXX: Kludge to hide the circular dependency.
+ (module-ref (resolve-interface '(gnu packages guile))
- 'guile-3.0/fixed)
++ 'guile-3.0/pinned)
+ autoconf
+ bash-minimal))
(arguments
- '(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let* ((out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin"))
- (autoconf (string-append
- (assoc-ref %build-inputs "autoconf")
- "/bin/autoconf"))
- (guile (string-append
- (assoc-ref %build-inputs "guile")
- "/bin/guile"))
- (sh (string-append
- (assoc-ref %build-inputs "bash")
- "/bin/sh"))
+ (list
+ #:modules '((guix build utils))
+ #:builder
+ #~(begin
+ (use-modules (guix build utils))
+ (let ((bin (string-append #$output "/bin"))
+ (autoconf (search-input-file %build-inputs "/bin/autoconf"))
+ (guile (search-input-file %build-inputs "/bin/guile"))
+ (sh (search-input-file %build-inputs "/bin/sh"))
(modules ((compose dirname dirname dirname)
(search-path %load-path
"guix/build/utils.scm"))))
diff --cc gnu/packages/bdw-gc.scm
index cfa037dec0,ae0d761ac3..db01d1a7e2
--- a/gnu/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@@ -34,43 -33,48 +34,49 @@@
(define-public libgc
(package
(name "libgc")
- (version "8.0.4")
+ (version "8.0.6")
(source (origin
(method url-fetch)
- (uri (string-append "https://github.com/ivmai/bdwgc/releases";
- "/download/v" version "/gc-" version
".tar.gz"))
+ (uri (list (string-append
"https://github.com/ivmai/bdwgc/releases";
+ "/download/v" version
+ "/gc-" version ".tar.gz")
+ (string-append "https://www.hboehm.info/gc/gc_source";
+ "/gc-" version ".tar.gz")))
(sha256
(base32
- "1798rp3mcfkgs38ynkbg2p47bq59pisrc6mn0l20pb5iczf0ssj3"))))
+ "04ga3c95w5az5sznzm73j19lvvfpf6k4sgkpjqsmjxpsr6mi8j9v"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags
- (list
- ;; Install gc_cpp.h et al.
- "--enable-cplusplus"
+ (list
+ #:configure-flags
+ #~(list
+ ;; Install gc_cpp.h et al.
+ "--enable-cplusplus"
- ;; Work around <https://github.com/ivmai/bdwgc/issues/353>.
- "--disable-munmap"
+ ;; Work around <https://github.com/ivmai/bdwgc/issues/353>.
+ "--disable-munmap"
- ;; In GNU/Hurd systems during the 'check' phase,
- ;; there is a deadlock caused by the 'gctest' test.
- ;; To disable the error set "--disable-gcj-support"
- ;; to configure script. See bug report and discussion:
- ;; <https://lists.opendylan.org/pipermail/bdwgc/2017-April/006275.html>
- ;; <https://lists.gnu.org/archive/html/bug-hurd/2017-01/msg00008.html>
- ,@(if (target-hurd? (or (%current-system)
- (%current-target-system)))
- '("--disable-gcj-support")
- '()))))
+ ;; In GNU/Hurd systems during the 'check' phase,
+ ;; there is a deadlock caused by the 'gctest' test.
+ ;; To disable the error set "--disable-gcj-support"
+ ;; to configure script. See bug report and discussion:
+ ;;
<https://lists.opendylan.org/pipermail/bdwgc/2017-April/006275.html>
+ ;; <https://lists.gnu.org/archive/html/bug-hurd/2017-01/msg00008.html>
+ #$@(if (target-hurd? (or (%current-system)
+ (%current-target-system)))
+ #~("--disable-gcj-support")
+ #~()))))
(native-inputs (list pkg-config))
(propagated-inputs
(if (%current-target-system)
;; The build system refuses to check for compiler intrinsics when
;; cross-compiling, and demands using libatomic-ops instead.
- `(("libatomic-ops" ,libatomic-ops))
+ (list libatomic-ops)
'()))
(outputs '("out" "debug"))
+ (properties
+ '((release-monitoring-url . "https://www.hboehm.info/gc/gc_source/";)
+ (upstream-name . "gc")))
(synopsis "The Boehm-Demers-Weiser conservative garbage collector
for C and C++")
(description
diff --cc gnu/packages/gcc.scm
index 5e2783d0dc,bf3c753b2d..6f7bebb6a7
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -3,10 -3,10 +3,10 @@@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2021 Ricardo Wurmus
<rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
- ;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022 Efraim Flashner
<efraim@flashner.co.il>
+ ;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2018, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
diff --cc gnu/packages/ghostscript.scm
index 8142d0b9cd,55f3ab9364..3c85f61d88
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@@ -42,10 -41,8 +42,9 @@@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
- #:use-module (guix build-system trivial)
#:use-module (srfi srfi-1))
(define-public lcms
diff --cc gnu/packages/gnome.scm
index b32ab8f97e,a13fbb2436..df6762f159
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -12309,9 -12530,9 +12359,9 @@@ integrate seamlessly with the GNOME des
(inputs
(list glib-networking ;for TLS support
gsettings-desktop-schemas
- gtk+
+ gtk
gtk-vnc
- gtksourceview
+ gtksourceview-4
json-glib
libarchive
libgudev
diff --cc gnu/packages/gnuzilla.scm
index 2cd7f0f7d8,5a2e716042..0cdd0936ba
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -1,7 -1,7 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic
Courtès <ludo@gnu.org>
+;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
- ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Mark H
Weaver <mhw@netris.org>
+ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023
Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner
<efraim@flashner.co.il>
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
@@@ -366,8 -349,12 +369,12 @@@ from collections.abc import MutableSequ
rust
`(,rust "cargo")))
(inputs
- (list icu4c readline zlib))))
+ (list icu4c-69 readline zlib))))
+
+ ;;;
+ ;;; Localization helper procedures.
+ ;;;
(define mozilla-compare-locales
(origin
(method hg-fetch)
@@@ -673,12 -671,12 +691,12 @@@ variable defined below. It requires gu
"--sort=name"
icecat-dir)))))))))
- (define-public icecat
+ (define-public icecat-minimal
(package
- (name "icecat")
+ (name "icecat-minimal")
(version %icecat-version)
(source icecat-source)
- (build-system gnu-build-system)
+ (build-system mozilla-build-system)
(inputs
(list alsa-lib
bzip2
diff --cc gnu/packages/guile.scm
index c2ffbefeec,2fd9b711ce..32faa8c020
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -398,9 -388,42 +398,13 @@@ without requiring the source code to b
(files '("lib/guile/3.0/site-ccache"
"share/guile/site/3.0")))))))
-(define-public guile-3.0-latest
- (package
- (inherit guile-3.0)
- (version "3.0.9")
- (source (origin
- (inherit (package-source guile-3.0))
- (uri (string-append "mirror://gnu/guile/guile-"
- version ".tar.xz"))
- (sha256
- (base32
- "03bm1mnfc9kkg2ls942a0js7bxrdzmcffgrgg6anwdmjfan2a9hs"))))
- (arguments
- (substitute-keyword-arguments (package-arguments guile-3.0)
- ;; Guile 3.0.9 is bit-reproducible when built in parallel, thanks to
- ;; its multi-stage build process for cross-module inlining, except when
- ;; cross-compiling.
- ((#:parallel-build? _ #f)
- (not (%current-target-system)))
- ((#:phases phases)
- `(modify-phases ,phases
- ,@(if (target-ppc32?)
- `((replace 'adjust-bootstrap-flags
- (lambda _
- ;; Upstream knows about suggested solution.
- ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214
- ;;
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=977223#46
- (substitute* "stage0/Makefile.in"
- (("^GUILE_OPTIMIZATIONS.*")
- "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives
-Ocps\n")))))
- '())))))))
+(define-public guile-3.0-latest guile-3.0)
- (define-public guile-3.0/fixed
+ ;;; The symbol guile-3.0/fixed should be used when guile-3.0 needs fixes
+ ;;; (security or else) and this deprecation could be removed.
+ (define-deprecated/public-alias guile-3.0/fixed guile-3.0/pinned)
+
+ (define-public guile-3.0/pinned
;; A package of Guile that's rarely changed. It is the one used in the
;; `base' module, and thus changing it entails a full rebuild.
(package
diff --cc gnu/packages/haskell.scm
index 3ae2f5045c,dddc85459a..6676a3b98b
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@@ -1158,18 -1139,11 +1158,18 @@@ interactive environment for the functio
(uri (string-append
"https://www.haskell.org/ghc/dist/";
version "/ghc-" version "-testsuite.tar.xz"))
- (patches (search-patches "ghc-testsuite-dlopen-pie.patch"))
+ (patches (search-patches "ghc-testsuite-dlopen-pie.patch"
+ "ghc-testsuite-grep-compat.patch"))
(sha256
(base32
- "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z"))))
+ "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; collections.Iterable was moved to collections.abc in Python
3.10.
+ '(substitute* "testsuite/driver/testlib.py"
+ (("collections\\.Iterable")
+ "collections.abc.Iterable")))))
- ("git" ,git-minimal/fixed) ; invoked during tests
+ ("git" ,git-minimal/pinned) ; invoked during tests
,@(filter (match-lambda
(("ghc-bootstrap" . _) #f)
(("ghc-testsuite" . _) #f)
@@@ -1217,18 -1191,11 +1217,18 @@@
(uri (string-append
"https://www.haskell.org/ghc/dist/";
version "/ghc-" version "-testsuite.tar.xz"))
- (patches (search-patches "ghc-testsuite-dlopen-pie.patch"))
+ (patches (search-patches "ghc-testsuite-dlopen-pie.patch"
+ "ghc-testsuite-grep-compat.patch"))
(sha256
(base32
- "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz"))))
+ "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; collections.Iterable was moved to collections.abc in Python
3.10.
+ '(substitute* "testsuite/driver/testlib.py"
+ (("collections\\.Iterable")
+ "collections.abc.Iterable")))))
- ("git" ,git-minimal/fixed) ; invoked during tests
+ ("git" ,git-minimal/pinned) ; invoked during tests
,@(filter (match-lambda
(("ghc-bootstrap" . _) #f)
(("ghc-testsuite" . _) #f)
diff --cc gnu/packages/linux.scm
index a1fa8bcaab,3601744c51..9da2e62c07
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -7620,11 -7677,15 +7643,15 @@@ libnftnl has been previously known as l
used by nftables.")
(license license:gpl2+)))
+ ;;; The symbol libnftl/fixed should be used when libnftnl needs fixes
+ ;;; (security or else) and this deprecation could be removed.
+ (define-deprecated/public-alias libnftnl/fixed libnftnl/pinned)
+
;; This is used in iptables, which contributes to rust. We're pinning this
;; variant to avoid accidental rebuilds of rust.
- (define-public libnftnl/fixed
+ (define-public libnftnl/pinned
(package (inherit libnftnl)
- (version "1.2.0")
+ (version "1.2.3")
(source
(origin
(method url-fetch)
diff --cc gnu/packages/nss.scm
index a841ad4580,60247f34a2..5dc4c1baee
--- a/gnu/packages/nss.scm
+++ b/gnu/packages/nss.scm
@@@ -102,9 -123,10 +115,10 @@@ in the Mozilla clients."
(define-public nss
(package
(name "nss")
+ (replacement nss/fixed)
;; Also update and test the nss-certs package, which duplicates version
and
;; source to avoid a top-level variable reference & module cycle.
- (version "3.81")
+ (version "3.82")
(source (origin
(method url-fetch)
(uri (let ((version-with-underscores
diff --cc gnu/packages/pdf.scm
index 33b76f058f,6eee460740..a592d11bce
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -875,10 -880,10 +872,10 @@@ transformations on PDF files. It coul
pdf-to-pdf. It includes support for merging and splitting PDFs and to
manipulate the list of pages in a PDF file. It is not a PDF viewer or a
program capable of converting PDF into other formats.")
- ;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0.
- ;; Users can still choose to use the old license at their option.
- (license (list license:asl2.0 license:clarified-artistic))
- (home-page "https://qpdf.sourceforge.net/";)))
+ ;; Prior to the 7.0 release, QPDF was licensed under Artistic 2.0.
+ ;; Users can still choose to use the old license at their option.
+ (license (list license:asl2.0 license:clarified-artistic))
- (home-page "http://qpdf.sourceforge.net/";)))
++ (home-page "https://qpdf.sourceforge.net/";)))
(define-public qpdfview
(package
diff --cc gnu/packages/samba.scm
index fdba37d1b8,da103ed839..8c004a1aac
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@@ -172,14 -169,122 +172,14 @@@ The library is small, thread safe, and
external dependencies.")
(license license:x11)))
- (define-public samba/fixed
-(define-public samba
- (package
- (name "samba")
- (version "4.16.8")
- (source
- ;; For updaters: the current PGP fingerprint is
- ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
- (origin
- (method url-fetch)
- (uri (string-append "https://download.samba.org/pub/samba/stable/";
- "samba-" version ".tar.gz"))
- (sha256
- (base32 "11a1vikbijaq7csg49h5ivn25gx84v6wx8z8kgsj1wmkhsf9bcmv"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:make-flags #~(list "TEST_OPTIONS=--quick") ;some tests are very long
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'configure 'setup-docbook-stylesheets
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Append Samba's own DTDs to XML_CATALOG_FILES
- ;; (c.f. docs-xml/build/README).
- (copy-file "docs-xml/build/catalog.xml.in"
- "docs-xml/build/catalog.xml")
- (substitute* "docs-xml/build/catalog.xml"
- (("/@abs_top_srcdir@")
- (string-append (getcwd) "/docs-xml")))
- ;; Honor XML_CATALOG_FILES.
- (substitute* "buildtools/wafsamba/wafsamba.py"
- (("XML_CATALOG_FILES=\"\\$\\{SAMBA_CATALOGS\\}" all)
- (string-append all " $XML_CATALOG_FILES")))))
- (replace 'configure
- ;; Samba uses a custom configuration script that runs WAF.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((libdir (string-append #$output "/lib")))
- (invoke "./configure"
- "--enable-selftest"
- "--enable-fhs"
- (string-append "--prefix=" #$output)
- "--sysconfdir=/etc"
- "--localstatedir=/var"
- ;; Install public and private libraries into
- ;; a single directory to avoid RPATH issues.
- (string-append "--libdir=" libdir)
- (string-append "--with-privatelibdir=" libdir)
- "--with-system-mitkrb5" ;#$(this-package-input
"mit-krb5")
- (string-append "--with-system-mitkdc="
- (search-input-file inputs
"sbin/krb5kdc"))
- "--with-experimental-mit-ad-dc"))))
- (add-before 'install 'disable-etc,var-samba-directories-setup
- (lambda _
- (substitute* "dynconfig/wscript"
- (("bld\\.INSTALL_DIR.*") "")))))
- ;; FIXME: The test suite seemingly hangs after failing to provision the
- ;; test environment.
- #:tests? #f))
- (inputs
- (list acl
- cmocka
- cups
- gamin
- dbus
- gpgme
- gnutls
- jansson
- libarchive
- libtirpc
- linux-pam
- lmdb
- mit-krb5
- openldap
- perl
- python
- popt
- readline
- tdb))
- (propagated-inputs
- ;; In Requires or Requires.private of pkg-config files.
- (list ldb talloc tevent))
- (native-inputs
- (list perl-parse-yapp
- pkg-config
- python-cryptography ;for krb5 tests
- python-dnspython
- python-iso8601
- python-markdown
- rpcsvc-proto ;for 'rpcgen'
- python-pyasn1 ;for krb5 tests
- ;; For generating man pages.
- docbook-xml-4.2
- docbook-xsl-next ;otherwise the man pages are corrupted
- libxslt
- libxml2)) ;for XML_CATALOG_FILES
- (home-page "https://www.samba.org/";)
- (synopsis
- "The standard Windows interoperability suite of programs for GNU and
Unix")
- (description
- "Since 1992, Samba has provided secure, stable and fast file and print
-services for all clients using the SMB/CIFS protocol, such as all versions of
-DOS and Windows, OS/2, GNU/Linux and many others.
-
-Samba is an important component to seamlessly integrate Linux/Unix Servers and
-Desktops into Active Directory environments using the winbind daemon.")
- (license license:gpl3+)))
-
-;;; FIXME: Invert inheritance relationship; the "pinned" package shouldn't be
-;;; susceptible to changes in the free one.
+ (define-public samba/pinned
- ;; Version that rarely changes, depended on by libsoup.
(hidden-package
(package
- (inherit samba)
- (replacement samba/fixed)
- (version "4.15.3")
+ (name "samba")
+ (version "4.17.0")
(source
+ ;; For updaters: the current PGP fingerprint is
+ ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
(origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/samba/stable/";
@@@ -267,34 -304,21 +267,34 @@@
docbook-xml-4.2
docbook-xsl
libxslt
- libxml2)))))
+ libxml2)) ;for XML_CATALOG_FILES
+ (home-page "https://www.samba.org/";)
+ (synopsis
+ "The standard Windows interoperability suite of programs for GNU and
Unix")
+ (description
+ "Since 1992, Samba has provided secure, stable and fast file and print
+services for all clients using the SMB/CIFS protocol, such as all versions of
+DOS and Windows, OS/2, GNU/Linux and many others.
-(define-public samba/fixed
+Samba is an important component to seamlessly integrate Linux/Unix Servers and
+Desktops into Active Directory environments using the winbind daemon.")
+ (license license:gpl3+))))
+
+(define-public samba
(package
- (inherit samba/fixed)
+ (inherit samba/pinned)
- ;; This is 4.15.13, but we need to trim the store file name to have
- ;; the same length as the one we are grafting above.
- (version "4.15.A")
+ (name "samba")
+ (version "4.17.0")
(source
+ ;; For updaters: the current PGP fingerprint is
+ ;; 81F5E2832BD2545A1897B713AA99442FB680B620.
(origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/samba/stable/";
- "samba-4.15.13.tar.gz"))
+ "samba-" version ".tar.gz"))
(sha256
- (base32 "0s29vzn5f42vjhx6h25c7v67n14ymqxn8glqa97d0rajd99y64n4"))))))
+ (base32 "0fl2y5avmyxjadh6zz0fwz35akd6c4j9lldzp2kyvjrgm36qx1h4"))))
- (properties (alist-delete 'hidden? (package-properties samba/fixed)))))
++ (properties (alist-delete 'hidden? (package-properties samba/pinned)))))
(define-public talloc
(package
diff --cc gnu/packages/tex.scm
index 3d8c71e62f,f178bafcc2..7172944c70
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -11887,11 -11294,11 +11961,11 @@@ and selecting references used in a publ
texlive-booktabs
texlive-endnotes
texlive-etoolbox
+ texlive-fancyhdr
- texlive-generic-xstring
+ texlive-xstring
+ texlive-graphics
texlive-latex-draftwatermark
- texlive-latex-fancyhdr
texlive-latex-float
- texlive-latex-graphics
texlive-lm
texlive-substr
texlive-times
diff --cc gnu/packages/wxwidgets.scm
index 0eaebc1068,5440a2725b..b226aa4e83
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@@ -9,7 -9,7 +9,8 @@@
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
+;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
+ ;;; Copyright © 2023 Malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;