[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge remote-tracking branch 'origin/master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge remote-tracking branch 'origin/master' into core-updates |
|
Date: |
Wed, 15 May 2024 18:20:15 -0400 (EDT) |
jpoiret pushed a commit to branch core-updates
in repository guix.
commit c2263e0e7c3cc8501d373b4ad44b3ccba5fe6a8e
Merge: 5c7a58ae71 4901f1b604
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Thu May 16 00:12:20 2024 +0200
Merge remote-tracking branch 'origin/master' into core-updates
Change-Id: Ia20582fdcf52c002198e8a168a0897ce68602dcf
.dir-locals.el | 2 +
doc/guix.texi | 83 +-
etc/teams.scm | 4 +
gnu/local.mk | 12 +-
gnu/packages/admin.scm | 10 +-
gnu/packages/adns.scm | 4 +-
gnu/packages/arcan.scm | 4 +-
gnu/packages/astronomy.scm | 8 +-
gnu/packages/audio.scm | 17 +-
gnu/packages/bioconductor.scm | 2930 +++++++++++---------
gnu/packages/bioinformatics.scm | 145 +-
gnu/packages/bittorrent.scm | 8 +-
gnu/packages/c.scm | 22 +
gnu/packages/compression.scm | 44 +
gnu/packages/containers.scm | 4 +-
gnu/packages/coq.scm | 5 +-
gnu/packages/cran.scm | 530 +++-
gnu/packages/databases.scm | 28 +-
gnu/packages/electronics.scm | 41 +
gnu/packages/emacs-xyz.scm | 95 +-
gnu/packages/engineering.scm | 40 +-
gnu/packages/fcitx5.scm | 37 +-
gnu/packages/file-systems.scm | 80 +-
gnu/packages/freedesktop.scm | 56 +-
gnu/packages/game-development.scm | 16 +-
gnu/packages/games.scm | 34 +-
gnu/packages/geo.scm | 453 +--
gnu/packages/gettext.scm | 12 +
gnu/packages/gnome.scm | 30 +-
gnu/packages/gnuzilla.scm | 12 +-
gnu/packages/golang-crypto.scm | 29 +-
gnu/packages/golang-web.scm | 109 +
gnu/packages/golang-xyz.scm | 276 +-
gnu/packages/golang.scm | 76 +-
gnu/packages/graphics.scm | 67 +
gnu/packages/gtk.scm | 17 +-
gnu/packages/guile-xyz.scm | 62 +-
gnu/packages/icu4c.scm | 16 -
gnu/packages/ipfs.scm | 148 +-
gnu/packages/irc.scm | 167 +-
gnu/packages/java.scm | 8 +-
gnu/packages/kde.scm | 8 +-
gnu/packages/linux.scm | 8 +-
gnu/packages/machine-learning.scm | 64 +-
gnu/packages/mail.scm | 11 +-
gnu/packages/mate.scm | 104 +-
gnu/packages/maths.scm | 342 ++-
gnu/packages/messaging.scm | 54 +-
gnu/packages/networking.scm | 17 +-
gnu/packages/nss.scm | 8 +
gnu/packages/ocaml.scm | 33 +-
gnu/packages/package-management.scm | 26 +-
.../patches/audacity-ffmpeg-fallback.patch | 61 -
.../patches/ddcci-driver-linux-linux-6.8.patch | 36 +
.../patches/guile-lib-fix-tests-for-guile2.2.patch | 52 +
.../krita-bump-sip-abi-version-to-12.8.patch | 25 +
...tall_libs.patch => xpra-6.0-install_libs.patch} | 30 +-
...ystemd-run.patch => xpra-6.0-systemd-run.patch} | 12 +-
gnu/packages/potassco.scm | 33 +
gnu/packages/python-science.scm | 4 +-
gnu/packages/python-web.scm | 37 +-
gnu/packages/python-xyz.scm | 156 +-
gnu/packages/ruby.scm | 2 +-
gnu/packages/statistics.scm | 90 +-
gnu/packages/sycl.scm | 20 +-
gnu/packages/syncthing.scm | 52 +-
gnu/packages/terminals.scm | 17 +-
gnu/packages/text-editors.scm | 12 +-
gnu/packages/textutils.scm | 13 +-
gnu/packages/tmux.scm | 7 +-
gnu/packages/tree-sitter.scm | 76 +
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 40 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/web.scm | 11 +-
gnu/packages/wm.scm | 18 +
gnu/packages/wxwidgets.scm | 4 +-
gnu/packages/xorg.scm | 12 +-
gnu/services/pm.scm | 60 +-
gnu/system/file-systems.scm | 2 +-
guix/build-system/r.scm | 2 +-
guix/channels.scm | 9 +-
guix/import/cran.scm | 6 +-
guix/self.scm | 8 +-
guix/store.scm | 55 +-
nix/libutil/util.cc | 11 +-
tests/guix-download.sh | 7 +-
tests/syscalls.scm | 4 +-
88 files changed, 4938 insertions(+), 2474 deletions(-)
diff --cc gnu/packages/gtk.scm
index d3b1e682df,fdf1fd9251..1f0168dced
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@@ -180,36 -179,48 +180,49 @@@ such as mate-panel and xfce4-panel."
(base32 "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
(build-system meson-build-system)
(arguments
- `(#:tests? #f ; see
http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
- #:glib-or-gtk? #t
- #:configure-flags
- (list "-Dtests=disabled")
- ,@(if (%current-target-system)
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-cross-compilation
- (lambda _
- ;; XXX: Let meson-build-system customize the property
- (substitute* "meson.build"
- (("'ipc_rmid_deferred_release', 'auto'")
- ;; see
https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
- ;; XXX: check it on hurd.
- "'ipc_rmid_deferred_release', 'true'"))))))
- '())))
+ (list
+ #:tests? #f ; see
http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+ #:glib-or-gtk? #t
+ #:configure-flags
- #~(list "-Dtests=disabled")))
++ #~(list "-Dtests=disabled")
++ #:phases
++ #~(modify-phases %standard-phases
++ #$@(if (%current-target-system)
++ (list
++ #~(add-after 'unpack 'fix-cross-compilation
++ (lambda _
++ ;; XXX: Let meson-build-system customize the property
++ (substitute* "meson.build"
++ (("'ipc_rmid_deferred_release', 'auto'")
++ ;; see
https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65
++ ;; XXX: check it on hurd.
++ "'ipc_rmid_deferred_release', 'true'")))))
++ '()))))
(native-inputs
- `(,@(if (target-hurd?)
- '()
- `(("gobject-introspection" ,gobject-introspection)))
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)))
+ (append (list pkg-config
+ python-wrapper)
+ (if (target-hurd?)
+ '()
+ (list gobject-introspection))))
(inputs
- `(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap
- ,@(if (target-hurd?)
- '()
- `(("drm" ,libdrm)))
- ("ghostscript" ,ghostscript)
- ("libspectre" ,libspectre)
- ,@(if (target-hurd?)
- '()
- `(("poppler" ,poppler)))))
+ (append
+ (list bash-minimal ;for glib-or-gtk-wrap
+ ghostscript
+ libspectre)
+ (if (target-hurd?)
+ '()
+ (list libdrm
+ poppler))))
(propagated-inputs
- `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("glib" ,glib)
- ("libpng" ,libpng)
- ("pixman" ,pixman)
- ("x11" ,libx11)
- ("xcb" ,libxcb)
- ("xext" ,libxext)
- ("xrender" ,libxrender)))
+ (list fontconfig
+ freetype
+ glib
+ libpng
+ pixman
+ libx11
+ libxcb
+ libxext
+ libxrender))
(synopsis "Multi-platform 2D graphics library")
(description "Cairo is a 2D graphics library with support for multiple
output
devices. Currently supported output targets include the X Window System (via
diff --cc gnu/packages/mate.scm
index 6a1fd0d6f6,5dcd3910e6..014a8f6ff6
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@@ -728,55 -727,55 +728,55 @@@ infamous 'Wanda the Fish'."
(("gtk-update-icon-cache") "true"))
#t)))))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("intltool" ,intltool)
- ("itstool" ,itstool)
- ("yelp-tools" ,yelp-tools)
- ("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("gtk-doc" ,gtk-doc/stable)
- ("texlive-bin" ,texlive-bin) ;synctex
- ("xmllint" ,libxml2)
- ("zlib" ,zlib)))
+ (list pkg-config
+ intltool
+ itstool
+ yelp-tools
+ (list glib "bin")
+ gobject-introspection
- gtk-doc
++ gtk-doc/stable
+ texlive-bin ;synctex
+ libxml2
+ zlib))
(inputs
- `(("at-spi2-core" ,at-spi2-core)
- ("cairo" ,cairo)
- ("caja" ,caja)
- ("dconf" ,dconf)
- ("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
- ("djvulibre" ,djvulibre)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("ghostscript" ,ghostscript)
- ("glib" ,glib)
- ("gtk+" ,gtk+)
- ("js-mathjax" ,js-mathjax)
- ("libcanberra" ,libcanberra)
- ("libsecret" ,libsecret)
- ("libspectre" ,libspectre)
- ("libtiff" ,libtiff)
- ("libx11" ,libx11)
- ("libice" ,libice)
- ("libsm" ,libsm)
- ("libgxps" ,libgxps)
- ("libjpeg" ,libjpeg-turbo)
- ("libxml2" ,libxml2)
- ("dogtail" ,python-dogtail)
- ("shared-mime-info" ,shared-mime-info)
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("libgnome-keyring" ,libgnome-keyring)
- ("libarchive" ,libarchive)
- ("marco" ,marco)
- ("openjpeg" ,openjpeg)
- ("pango" ,pango)
- ;;("texlive" ,texlive)
- ;; TODO:
- ;; Build libkpathsea as a shared library for DVI support.
- ;; ("libkpathsea" ,texlive-bin)
- ("poppler" ,poppler)
- ("webkitgtk" ,webkitgtk-for-gtk3)))
+ (list at-spi2-core
+ cairo
+ caja
+ dconf
+ dbus
+ dbus-glib
+ djvulibre
+ fontconfig
+ freetype
+ ghostscript
+ glib
+ gtk+
+ js-mathjax
+ libcanberra
+ libsecret
+ libspectre
+ libtiff
+ libx11
+ libice
+ libsm
+ libgxps
+ libjpeg-turbo
+ libxml2
+ python-dogtail
+ shared-mime-info
+ gdk-pixbuf
+ gsettings-desktop-schemas
+ libgnome-keyring
+ libarchive
+ marco
+ openjpeg
+ pango
+ ;;texlive
+ ;; TODO:
+ ;; Build libkpathsea as a shared library for DVI support.
+ ;; ("libkpathsea" ,texlive-bin)
+ poppler
+ webkitgtk-for-gtk3))
(home-page "https://mate-desktop.org";)
(synopsis "Document viewer for Mate")
(description
diff --cc gnu/packages/messaging.scm
index 5f74c44b89,83463f44c6..3fe6493f42
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@@ -28,9 -28,8 +28,9 @@@
;;; Copyright © 2020, 2022 Raghav Gururajan <rg@raghavgururajan.name>
;;; Copyright © 2020, 2021 Robert Karszniewicz <avoidr@posteo.de>
;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
- ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
+ ;;; Copyright © 2021, 2024 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org>
;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net>
diff --cc gnu/packages/package-management.scm
index a89b8f35eb,56a3e1028e..d7a80652ab
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -495,10 -493,9 +495,10 @@@ $(prefix)/etc/openrc\n"))
("graphviz" ,graphviz-minimal)
("font-ghostscript" ,font-ghostscript) ;fonts for 'dot'
("help2man" ,help2man)
- ("po4a" ,po4a)))
+ ("po4a" ,po4a-minimal)))
(inputs
- `(("bzip2" ,bzip2)
+ `(("bash-minimal", bash-minimal)
+ ("bzip2" ,bzip2)
("gzip" ,gzip)
("sqlite" ,sqlite)
("libgcrypt" ,libgcrypt)