[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Fri, 22 Mar 2024 05:54:12 -0400 (EDT) |
jpoiret pushed a commit to branch core-updates
in repository guix.
commit 54219dc3a440aaf86ece4a65fec1a97c0952f6f2
Merge: 92e1ea709d 3d2966e0b7
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Fri Mar 22 10:46:45 2024 +0100
Merge remote-tracking branch 'origin/master' into core-updates
Change-Id: Id398a49a83cfe6f3a5ba0aee811d09ca12f897de
doc/build.scm | 26 +-
doc/contributing.texi | 254 +++++-
doc/guix-cookbook.texi | 17 +-
doc/guix.texi | 44 +-
etc/guix-daemon.service.in | 4 +-
etc/guix-publish.service.in | 4 +-
etc/news.scm | 71 +-
etc/teams.scm | 13 +-
etc/teams/qt/common.scm | 4 -
etc/teams/qt/qt-manifest.scm | 4 -
etc/teams/qt/qt5-manifest.scm | 4 -
etc/time-travel-manifest.scm | 24 +-
gnu/home/services/shepherd.scm | 14 +-
gnu/local.mk | 14 +-
gnu/packages/admin.scm | 126 +--
gnu/packages/algebra.scm | 6 +-
gnu/packages/audio.scm | 37 +-
gnu/packages/bioconductor.scm | 46 +-
gnu/packages/bioinformatics.scm | 179 +++--
gnu/packages/bittorrent.scm | 17 +-
gnu/packages/c.scm | 4 +-
gnu/packages/calendar.scm | 4 +-
gnu/packages/check.scm | 15 +-
gnu/packages/code.scm | 8 +-
gnu/packages/containers.scm | 4 +-
gnu/packages/cpp.scm | 11 +-
gnu/packages/cran.scm | 277 ++++---
gnu/packages/crates-io.scm | 1 +
gnu/packages/databases.scm | 4 +-
gnu/packages/diffoscope.scm | 5 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/documentation.scm | 45 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 893 +++++++++++----------
gnu/packages/emulators.scm | 17 +-
gnu/packages/finance.scm | 130 ++-
gnu/packages/fonts.scm | 126 ++-
gnu/packages/fontutils.scm | 6 +-
gnu/packages/freedesktop.scm | 25 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/games.scm | 73 +-
gnu/packages/gcc.scm | 7 +-
gnu/packages/gimp.scm | 109 ++-
gnu/packages/gnome.scm | 5 +-
gnu/packages/gnunet.scm | 150 ++--
gnu/packages/gnuzilla.scm | 18 +-
gnu/packages/golang-check.scm | 64 ++
gnu/packages/golang-compression.scm | 45 +-
gnu/packages/golang-crypto.scm | 26 +-
gnu/packages/golang-web.scm | 232 ++++++
gnu/packages/golang-xyz.scm | 296 ++++++-
gnu/packages/golang.scm | 179 +----
gnu/packages/guile-xyz.scm | 12 +-
gnu/packages/ipfs.scm | 26 +-
gnu/packages/java.scm | 54 +-
gnu/packages/javascript.scm | 20 +-
gnu/packages/kde-plasma.scm | 4 +-
gnu/packages/linux.scm | 73 +-
gnu/packages/lisp-xyz.scm | 801 ++++++++++++++----
gnu/packages/lisp.scm | 4 +-
gnu/packages/llvm-meta.scm | 83 ++
gnu/packages/llvm.scm | 72 +-
gnu/packages/logging.scm | 11 +-
gnu/packages/lua.scm | 4 +-
gnu/packages/machine-learning.scm | 55 ++
gnu/packages/mail.scm | 4 +-
gnu/packages/man.scm | 47 +-
gnu/packages/markup.scm | 4 +-
gnu/packages/mastodon.scm | 19 +-
gnu/packages/maths.scm | 42 +-
gnu/packages/mc.scm | 5 +-
gnu/packages/music.scm | 174 ++--
gnu/packages/nx.scm | 246 ++++++
gnu/packages/ocr.scm | 6 +-
gnu/packages/package-management.scm | 49 +-
gnu/packages/password-utils.scm | 12 +-
.../patches/clang-17.0-link-dsymutil-latomic.patch | 14 +
.../patches/hubbub-maybe-uninitialized.patch | 40 -
gnu/packages/patches/libcss-check-format.patch | 13 +
.../patches/libextractor-tidy-support.patch | 81 ++
.../patches/netsurf-message-timestamp.patch | 4 +-
gnu/packages/patches/python-3.12-fix-tests.patch | 334 ++++++++
.../patches/python-poppler-qt5-fix-build.patch | 116 ---
gnu/packages/patches/qemu-build-info-manual.patch | 37 +-
...s.patch => qemu-disable-bios-tables-test.patch} | 36 +-
...ruby-x25519-automatic-fallback-non-x86_64.patch | 45 ++
gnu/packages/patches/sioyek-fix-build.patch | 82 ++
.../patches/sway-add-libinput-config-accel.patch | 49 --
gnu/packages/patchutils.scm | 4 +-
gnu/packages/pdf.scm | 138 ++--
gnu/packages/photo.scm | 4 +-
gnu/packages/plotutils.scm | 6 +-
gnu/packages/python-web.scm | 248 +++++-
gnu/packages/python-xyz.scm | 325 +++++++-
gnu/packages/python.scm | 392 ++++++++-
gnu/packages/qt.scm | 60 +-
gnu/packages/radio.scm | 4 +-
gnu/packages/raspberry-pi.scm | 6 +-
gnu/packages/rdf.scm | 39 -
gnu/packages/ruby.scm | 18 +-
gnu/packages/rust-apps.scm | 203 ++++-
gnu/packages/rust.scm | 9 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/security-token.scm | 49 +-
gnu/packages/shells.scm | 8 +-
gnu/packages/statistics.scm | 23 +-
gnu/packages/swig.scm | 4 +-
gnu/packages/syncthing.scm | 30 +-
gnu/packages/telegram.scm | 107 +--
gnu/packages/terminals.scm | 3 +
gnu/packages/text-editors.scm | 30 +-
gnu/packages/time.scm | 25 +
gnu/packages/tor-browsers.scm | 66 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/video.scm | 75 ++
gnu/packages/virtualization.scm | 25 +-
gnu/packages/weather.scm | 6 +-
gnu/packages/web-browsers.scm | 30 +-
gnu/packages/web.scm | 199 +++--
gnu/packages/webkit.scm | 11 +-
gnu/packages/wget.scm | 12 +-
gnu/packages/wine.scm | 12 +-
gnu/packages/wm.scm | 131 ++-
gnu/packages/xdisorg.scm | 26 +-
gnu/packages/xfce.scm | 132 +--
gnu/packages/xiph.scm | 4 +
gnu/packages/xorg.scm | 4 +-
gnu/packages/zig-xyz.scm | 25 +-
gnu/packages/zig.scm | 7 +-
gnu/services/base.scm | 15 +-
gnu/services/messaging.scm | 6 +
gnu/services/sddm.scm | 7 +-
gnu/services/shepherd.scm | 13 +-
gnu/services/xorg.scm | 2 +
gnu/system/linux-initrd.scm | 14 +-
gnu/tests/messaging.scm | 2 +-
guix/build/bzr.scm | 3 +-
guix/build/download-nar.scm | 12 +-
guix/build/download.scm | 50 +-
guix/build/git.scm | 27 +-
guix/bzr-download.scm | 57 +-
guix/cpu.scm | 24 +-
guix/cvs-download.scm | 24 +-
guix/describe.scm | 48 +-
guix/download.scm | 53 +-
guix/git-download.scm | 20 +-
guix/hg-download.scm | 36 +-
guix/lint.scm | 151 ++--
guix/profiles.scm | 4 +-
guix/scripts/git/authenticate.scm | 2 +
guix/scripts/perform-download.scm | 69 +-
guix/scripts/system/reconfigure.scm | 3 +-
guix/scripts/time-machine.scm | 4 +-
guix/svn-download.scm | 88 +-
guix/swh.scm | 71 +-
guix/transformations.scm | 8 +-
nix/libstore/build.cc | 17 +
nix/libutil/util.cc | 116 ++-
nix/libutil/util.hh | 7 +
tests/guix-time-machine.sh | 4 +-
tests/lint.scm | 20 +
tests/swh.scm | 74 ++
162 files changed, 7104 insertions(+), 2836 deletions(-)
diff --cc gnu/local.mk
index 20c4e3659c,7f1006010b..1b7d55911b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1038,18 -1038,13 +1040,19 @@@ dist_patch_DATA =
%D%/packages/patches/clang-11.0-libc-search-path.patch \
%D%/packages/patches/clang-12.0-libc-search-path.patch \
%D%/packages/patches/clang-13.0-libc-search-path.patch \
+ %D%/packages/patches/clang-13-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-14.0-libc-search-path.patch \
+ %D%/packages/patches/clang-14-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-15.0-libc-search-path.patch \
%D%/packages/patches/clang-16.0-libc-search-path.patch \
+ %D%/packages/patches/clang-16-remove-crypt-interceptors.patch \
%D%/packages/patches/clang-17.0-libc-search-path.patch \
+ %D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch \
%D%/packages/patches/clang-runtime-asan-build-fixes.patch \
%D%/packages/patches/clang-runtime-esan-build-fixes.patch \
+ %D%/packages/patches/clang-runtime-13-glibc-2.36-compat.patch \
+ %D%/packages/patches/clang-runtime-14-glibc-2.36-compat.patch \
+ %D%/packages/patches/clang-runtime-9-glibc-2.36-compat.patch
\
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch
\
%D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \
@@@ -1471,9 -1445,12 +1474,8 @@@
%D%/packages/patches/http-parser-CVE-2020-8287.patch \
%D%/packages/patches/htslib-for-stringtie.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
- %D%/packages/patches/hubbub-maybe-uninitialized.patch \
%D%/packages/patches/hueplusplus-mbedtls.patch \
- %D%/packages/patches/hurd-add-without-rump-configure-option.patch \
- %D%/packages/patches/hurd-fix-rumpdisk-build.patch \
%D%/packages/patches/hurd-rumpdisk-no-hd.patch \
-
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch
\
-
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \
%D%/packages/patches/hwloc-1-test-btrfs.patch \
%D%/packages/patches/i7z-gcc-10.patch \
%D%/packages/patches/icecat-makeicecat.patch \
@@@ -1839,10 -1807,7 +1844,9 @@@
%D%/packages/patches/python-docrepr-fix-tests.patch \
%D%/packages/patches/python-feedparser-missing-import.patch \
%D%/packages/patches/python-louvain-fix-test.patch \
+ %D%/packages/patches/python-matplotlib-fix-legend-loc-best-test.patch
\
%D%/packages/patches/python-random2-getrandbits-test.patch \
+ %D%/packages/patches/python-pillow-use-zlib-1.3.patch \
- %D%/packages/patches/python-poppler-qt5-fix-build.patch \
%D%/packages/patches/python-pyreadstat-link-libiconv.patch \
%D%/packages/patches/python-pyls-black-41.patch \
%D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch
\
diff --cc gnu/packages/freedesktop.scm
index b270f381e0,8a4f490be2..826425f5f3
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -33,7 -33,7 +33,8 @@@
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Alex Devaure <ajadevaure@gmail.com>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
+ ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gnome.scm
index bdf300cf77,06256066bc..576bccd4a1
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -852,10 -855,9 +852,10 @@@ tomorrow, the rest of the week and for
itstool
pkg-config))
(inputs
- (list babl
+ (list bash-minimal
+ babl
cairo
- gegl
+ gegl-0.4.44
geocode-glib
gexiv2
gfbgraph
diff --cc gnu/packages/llvm.scm
index 59d096cb1a,2b8e8d6215..a604ef0d71
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -597,14 -547,11 +536,15 @@@ output), and Binutils."
("17.0.6" . "1a7rq3rgw5vxm8y39fyzr4kv7w97lli4a0c1qrkchwk8p0n07hgh")))
(define %llvm-patches
- '(("14.0.6" . ("clang-14.0-libc-search-path.patch"))
- ("15.0.7" . ("clang-15.0-libc-search-path.patch"))
- ("16.0.6" . ("clang-16.0-libc-search-path.patch"))
+ '(("14.0.6" . ("clang-14.0-libc-search-path.patch"
+ "clang-runtime-14-glibc-2.36-compat.patch"
+ "clang-14-remove-crypt-interceptors.patch"))
+ ("15.0.7" . ("clang-15.0-libc-search-path.patch"
+ "clang-16-remove-crypt-interceptors.patch"))
+ ("16.0.6" . ("clang-16.0-libc-search-path.patch"
+ "clang-16-remove-crypt-interceptors.patch"))
- ("17.0.6" . ("clang-17.0-libc-search-path.patch"))))
+ ("17.0.6" . ("clang-17.0-libc-search-path.patch"
+ "clang-17.0-link-dsymutil-latomic.patch"))))
(define (llvm-monorepo version)
(origin
diff --cc gnu/packages/man.scm
index e744fc4004,780f6bf6d8..3148fcc8a1
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@@ -9,8 -9,8 +9,8 @@@
;;; Copyright © 2018, 2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
-;;; Copyright © 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2021, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
- ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+ ;;; Copyright © 2022, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Imran Iqbal <imran@imraniqbal.org>
;;;
;;; This file is part of GNU Guix.
diff --cc gnu/packages/package-management.scm
index 935c8fd32b,e9dd7427d3..908346e6a0
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -9,10 -9,10 +9,10 @@@
;;; Copyright © 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2018, 2019 Eric Bavier <bavier@member.fsf.org>
- ;;; Copyright © 2019-2023 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020, 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
;;; Copyright © 2020 Jesse Gibbons <jgibbons2357+guix@gmail.com>
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
diff --cc gnu/packages/pdf.scm
index c4327b3b64,efbfc92a38..db77d4ca77
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@@ -17,10 -17,10 +17,10 @@@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
- ;;; Copyright © 2020-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+ ;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2024 Timotej Lazar <timotej.lazar@araneo.si>
-;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2020, 2022, 2023, 2024 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/telegram.scm
index f43fb7bb1f,8d835bf243..c4d1ba2868
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@@ -613,47 -614,50 +614,50 @@@ formerly a part of telegram-cli, but no
(base32 "0cf5s7ygslb5klg1qv9qdc3hivhspmvh3zkacyyhd2yyikb5p0f9"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No target
+ (list
+ #:tests? #f ; No target
#:imported-modules
- ((guix build copy-build-system)
- ,@%default-gnu-imported-modules)
+ `((guix build copy-build-system)
- ,@%gnu-build-system-modules)
++ ,@%default-gnu-imported-modules)
#:modules
- (((guix build copy-build-system)
- #:prefix copy:)
- (guix build gnu-build-system)
- (guix build utils))
+ '(((guix build copy-build-system)
+ #:prefix copy:)
+ (guix build gnu-build-system)
+ (guix build utils))
#:configure-flags
- (list
- ;; Use gcrypt instead of openssl.
- "--disable-openssl"
- ;; Enable extended queries system.
- "--enable-extf"
- ;; Include libevent-based net and timers.
- "--enable-libevent")
+ '(list
+ ;; Use gcrypt instead of openssl.
+ "--disable-openssl"
+ ;; Enable extended queries system.
+ "--enable-extf"
+ ;; Include libevent-based net and timers.
+ "--enable-libevent")
#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'trigger-bootstrap
- (lambda _
- (delete-file "configure")
- #t))
- (add-after 'trigger-bootstrap 'patch-tl-parser
- (lambda _
- (delete-file "Makefile.tl-parser")
- (substitute* "Makefile.in"
- (("include \\$\\{srcdir\\}/Makefile\\.tl-parser")
- "")
- (("\\$\\{EXE\\}/tl-parser")
- "tl-parser"))
- #t))
- (replace 'install
- (lambda args
- (apply (assoc-ref copy:%standard-phases 'install)
- #:install-plan
- '(("bin" "bin")
- ("." "include/tgl"
- #:include-regexp ("\\.h$"))
- ("libs" "lib/tgl"))
- args))))))
+ '(modify-phases %standard-phases
+ (add-after 'unpack 'trigger-bootstrap
+ (lambda _
+ (delete-file "configure")))
+ (add-after 'trigger-bootstrap 'patch-tl-parser
+ (lambda _
+ (delete-file "Makefile.tl-parser")
+ (substitute* "Makefile.in"
+ (("include \\$\\{srcdir\\}/Makefile\\.tl-parser")
+ "")
+ (("\\$\\{EXE\\}/tl-parser")
+ "tl-parser"))))
+ (add-after 'unpack 'remove-Werror
+ (lambda _
+ (substitute* "Makefile.in"
+ (("-Werror") ""))))
+ (replace 'install
+ (lambda args
+ (apply (assoc-ref copy:%standard-phases 'install)
+ #:install-plan
+ '(("bin" "bin")
+ ("." "include/tgl"
+ #:include-regexp ("\\.h$"))
+ ("libs" "lib/tgl"))
+ args))))))
(native-inputs
(list autoconf automake libtool pkg-config))
(inputs
@@@ -683,12 -687,13 +687,13 @@@
(base32 "0c1w7jgska71jjbvg1y09v52549pwa4zkdjly18yxywn7gayd2p6"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; No target
- #:imported-modules
- ((guix build copy-build-system)
+ (list
+ #:tests? #f ; No target
+ #:imported-modules
+ `((guix build copy-build-system)
- ,@%gnu-build-system-modules)
+ ,@%default-gnu-imported-modules)
- #:modules
- (((guix build copy-build-system)
+ #:modules
+ '(((guix build copy-build-system)
#:prefix copy:)
(guix build gnu-build-system)
(guix build utils))