[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into gnome-team
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into gnome-team |
|
Date: |
Mon, 1 Jan 2024 16:05:19 -0500 (EST) |
lilyp pushed a commit to branch gnome-team
in repository guix.
commit 1cd97066c2dc84c6e538cfa63820e18f6c12a414
Merge: b8175bc85a ee0cf3b9ff
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Mon Jan 1 21:56:00 2024 +0100
Merge branch 'master' into gnome-team
doc/contributing.texi | 2 +-
doc/guix-cookbook.texi | 236 +
doc/guix.texi | 187 +-
etc/teams.scm | 8 +-
gnu/bootloader/u-boot.scm | 17 +
gnu/build/chromium-extension.scm | 43 +-
gnu/build/shepherd.scm | 90 -
gnu/home/services/sound.scm | 102 +-
gnu/installer.scm | 2 +-
gnu/local.mk | 16 +-
gnu/packages/admin.scm | 4 +-
gnu/packages/algebra.scm | 2 +-
gnu/packages/axoloti.scm | 7 +-
gnu/packages/base.scm | 2 +-
gnu/packages/bioconductor.scm | 24 +-
gnu/packages/bioinformatics.scm | 146 +-
gnu/packages/bittorrent.scm | 11 +-
gnu/packages/bootloaders.scm | 36 +-
gnu/packages/browser-extensions.scm | 34 +-
gnu/packages/cdrom.scm | 30 +-
gnu/packages/cook.scm | 2 +-
gnu/packages/cpp.scm | 7 +-
gnu/packages/cran.scm | 420 +-
gnu/packages/crates-graphics.scm | 10 +-
gnu/packages/crates-io.scm | 676 +-
gnu/packages/cryptsetup.scm | 6 +-
gnu/packages/debug.scm | 4 +-
gnu/packages/diffoscope.scm | 4 +-
gnu/packages/disk.scm | 25 +-
gnu/packages/display-managers.scm | 89 +-
gnu/packages/ed.scm | 58 -
gnu/packages/electronics.scm | 2 +-
gnu/packages/emacs-xyz.scm | 46 +-
gnu/packages/file-systems.scm | 31 +
gnu/packages/finance.scm | 4 +-
gnu/packages/fonts.scm | 4 +-
gnu/packages/game-development.scm | 52 +
gnu/packages/games.scm | 74 +
gnu/packages/gcc.scm | 15 +
gnu/packages/geo.scm | 9 +-
gnu/packages/gl.scm | 47 +-
gnu/packages/gnome.scm | 27 +-
gnu/packages/gnunet.scm | 15 +-
gnu/packages/gnupg.scm | 3 +-
gnu/packages/gnuzilla.scm | 12 +-
gnu/packages/golang-check.scm | 12 +
gnu/packages/golang.scm | 146 +-
gnu/packages/guile-xyz.scm | 9 +-
gnu/packages/i2p.scm | 44 +-
gnu/packages/image.scm | 46 +-
gnu/packages/java.scm | 28 +
gnu/packages/linux.scm | 41 +-
gnu/packages/lisp-xyz.scm | 40 +-
gnu/packages/lisp.scm | 2 +-
gnu/packages/machine-learning.scm | 248 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/mp3.scm | 21 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/nano.scm | 51 -
gnu/packages/networking.scm | 9 +-
gnu/packages/node-xyz.scm | 71 +
gnu/packages/node.scm | 4 +-
gnu/packages/ocaml.scm | 1497 +-
gnu/packages/package-management.scm | 13 +-
gnu/packages/password-utils.scm | 2 +-
gnu/packages/patches/dante-non-darwin.patch | 15 +
.../onnx-1.13.1-use-system-googletest.patch | 55 +
.../patches/python-pytorch2-system-libraries.patch | 156 +
gnu/packages/patches/slim-config.patch | 43 +-
gnu/packages/patches/slim-display.patch | 74 +-
gnu/packages/patches/slim-reset.patch | 33 -
gnu/packages/patches/slim-session.patch | 17 -
gnu/packages/patches/slim-sigusr1.patch | 33 -
.../patches/transmission-4.0.5-fix-build.patch | 39 +
.../patches/u-boot-allow-disabling-openssl.patch | 56 +-
.../patches/u-boot-fix-build-python-3.10.patch | 37 -
.../patches/u-boot-fix-u-boot-lib-build.patch | 24 -
.../patches/u-boot-rk3399-enable-emmc-phy.patch | 26 -
.../patches/u-boot-rockchip-inno-usb.patch | 16 +-
.../u-boot-sifive-prevent-reloc-initrd-fdt.patch | 16 -
.../xnnpack-for-torch2-system-libraries.patch | 2660 ++
gnu/packages/patchutils.scm | 2 +-
gnu/packages/pdf.scm | 30 +
gnu/packages/protobuf.scm | 4 +-
gnu/packages/python-check.scm | 32 +
gnu/packages/python-xyz.scm | 177 +-
gnu/packages/qt.scm | 95 +
gnu/packages/shellutils.scm | 77 +-
gnu/packages/skarnet.scm | 7 +-
gnu/packages/ssh.scm | 11 +-
gnu/packages/sssd.scm | 4 +-
gnu/packages/statistics.scm | 40 +-
gnu/packages/syncthing.scm | 5 +-
gnu/packages/text-editors.scm | 60 +
gnu/packages/tor.scm | 285 +
gnu/packages/version-control.scm | 7 +-
gnu/packages/video.scm | 76 +-
gnu/packages/vim.scm | 55 +-
gnu/packages/web-browsers.scm | 2 +-
gnu/packages/web.scm | 4 +-
gnu/packages/wine.scm | 105 +-
gnu/packages/wm.scm | 12 +-
gnu/packages/xdisorg.scm | 57 +
gnu/packages/xorg.scm | 22 +-
gnu/services/ci.scm | 42 +-
gnu/services/databases.scm | 41 +-
gnu/services/guix.scm | 143 +-
gnu/services/messaging.scm | 91 +-
gnu/services/networking.scm | 36 +-
gnu/services/security-token.scm | 29 +-
gnu/services/telephony.scm | 132 +-
gnu/services/web.scm | 48 +-
gnu/system.scm | 1 -
gnu/system/examples/vm-image.tmpl | 28 +-
gnu/system/images/orangepi-r1-plus-lts-rk3328.scm | 76 +
gnu/system/install.scm | 7 +
gnu/tests/telephony.scm | 17 +-
guix/deprecation.scm | 2 +-
guix/download.scm | 26 +-
guix/gexp.scm | 31 +-
guix/import/cran.scm | 20 +-
guix/least-authority.scm | 25 +-
guix/scripts/download.scm | 2 +-
nix/libstore/build.cc | 10 +-
po/doc/guix-cookbook.de.po | 2843 +-
po/doc/guix-manual.de.po | 31471 +++++++++---------
po/doc/guix-manual.fr.po | 31591 ++++++++++---------
po/guix/de.po | 16 +-
po/guix/es.po | 8 +-
po/guix/it.po | 126 +-
po/guix/ja.po | 84 +-
po/guix/zh_CN.po | 66 +-
tests/gexp.scm | 54 +
133 files changed, 40957 insertions(+), 35511 deletions(-)
diff --cc gnu/local.mk
index 3c02929690,264b186f41..7a758beb80
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -60,8 -60,8 +60,9 @@@
# Copyright © 2023 Ivana Drazovic <iv.dra@hotmail.com>
# Copyright © 2023 Andy Tai <atai@atai.org>
# Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
+# Copyright © 2023 Bruno Victal <mirai@makinata.eu>
# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+ # Copyright © 2023 Herman Rimm <herman@rimm.ee>
#
# This file is part of GNU Guix.
#
@@@ -2007,12 -2003,8 +2010,9 @@@ dist_patch_DATA =
%D%/packages/patches/libsequoia-remove-store.patch \
%D%/packages/patches/serf-python3.patch \
%D%/packages/patches/shakespeare-spl-fix-grammar.patch \
+ %D%/packages/patches/shared-mime-info-xdgmime-path.patch \
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
- %D%/packages/patches/slim-session.patch \
%D%/packages/patches/slim-config.patch \
- %D%/packages/patches/slim-sigusr1.patch \
- %D%/packages/patches/slim-reset.patch \
%D%/packages/patches/slim-login.patch \
%D%/packages/patches/slim-display.patch \
%D%/packages/patches/stex-copy-from-immutable-store.patch \
diff --cc gnu/packages/gnome.scm
index de80b6f836,b2d4b73088..84f1d2be11
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -11869,22 -11809,21 +11869,21 @@@ functionality."
"gthumb-" version ".tar.xz"))
(sha256
(base32
- "09flm8s6jrvfya2ypw5873mnnani8ssy7wdv3ra1cljk4bjszy4p"))))
+ "1s4lqy883s296mbh4fywd1l3z79811ia00xs57c316pb1an97mmd"))))
(build-system meson-build-system)
(arguments
- `(#:glib-or-gtk? #t
- #:configure-flags
- ;; Ensure the RUNPATH contains all installed library locations.
- (list (string-append "-Dc_link_args=-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib/gthumb/extensions")
- (string-append "-Dcpp_link_args=-Wl,-rpath="
- (assoc-ref %outputs "out")
- "/lib/gthumb/extensions"))))
- (native-inputs
- (list desktop-file-utils ; for update-desktop-database
- `(,glib "bin") ; for glib-compile-resources
- `(,gtk+ "bin") ; for gtk-update-icon-cache
+ (list
+ #:glib-or-gtk? #t
+ #:configure-flags
+ ;; Ensure the RUNPATH contains all installed library locations.
+ #~(list (string-append "-Dc_link_args=-Wl,-rpath=" #$output
+ "/lib/gthumb/extensions")
+ (string-append "-Dcpp_link_args=-Wl,-rpath=" #$output
+ "/lib/gthumb/extensions"))))
+ (native-inputs
+ (list desktop-file-utils ; for update-desktop-database
+ `(,glib "bin") ; for glib-compile-resources
+ `(,gtk+ "bin") ; for gtk-update-icon-cache
intltool
itstool
pkg-config