guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: Merge branch 'master' into gnome-team


From: guix-commits
Subject: 01/02: Merge branch 'master' into gnome-team
Date: Sun, 14 Jan 2024 11:37:19 -0500 (EST)

lilyp pushed a commit to branch gnome-team
in repository guix.

commit 1682264fdafbfa15925cce3d0d11cbca26696e6d
Merge: 2cbb1a6e1e bcc9cd1aae
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sun Jan 14 17:23:44 2024 +0100

    Merge branch 'master' into gnome-team

 .guix-authorizations                               |   2 +
 .mailmap                                           |   1 +
 doc/guix.texi                                      | 129 +++--
 etc/news.scm                                       |  57 ++
 etc/teams.scm                                      |   8 +
 gnu/home/services/shepherd.scm                     |  12 +-
 gnu/image.scm                                      |   4 +
 gnu/local.mk                                       |  31 +-
 gnu/packages/admin.scm                             |   8 +-
 gnu/packages/astronomy.scm                         | 211 ++++----
 gnu/packages/audio.scm                             | 218 +++++---
 gnu/packages/bioconductor.scm                      | 135 ++++-
 gnu/packages/bioinformatics.scm                    | 112 +++-
 gnu/packages/bootloaders.scm                       |  58 ++-
 gnu/packages/check.scm                             |  41 +-
 gnu/packages/chemistry.scm                         |   2 +-
 gnu/packages/ci.scm                                |   5 +-
 gnu/packages/cpp.scm                               |  24 +-
 gnu/packages/cran.scm                              | 156 +++---
 gnu/packages/curl.scm                              |  15 +-
 gnu/packages/docker.scm                            |  14 +-
 gnu/packages/education.scm                         |   6 +-
 gnu/packages/emacs-xyz.scm                         |  49 +-
 gnu/packages/firmware.scm                          |  41 +-
 gnu/packages/fonts.scm                             |  29 +-
 gnu/packages/fontutils.scm                         |   8 +-
 gnu/packages/games.scm                             |  15 +-
 gnu/packages/geo.scm                               |  32 +-
 gnu/packages/gl.scm                                |  32 +-
 gnu/packages/gnome.scm                             |  10 +-
 gnu/packages/gnuzilla.scm                          |   3 +-
 gnu/packages/golang.scm                            | 367 +++++++++++--
 gnu/packages/graph.scm                             |   4 +-
 gnu/packages/graphviz.scm                          |  12 +-
 gnu/packages/gtk.scm                               |   6 +-
 gnu/packages/guile-xyz.scm                         |  90 +++-
 gnu/packages/hardware.scm                          |   1 +
 gnu/packages/jami.scm                              | 444 +++++-----------
 gnu/packages/java.scm                              |  55 +-
 gnu/packages/julia-xyz.scm                         |   4 +-
 gnu/packages/linux.scm                             |  51 +-
 gnu/packages/lisp-xyz.scm                          | 372 +++++++------
 gnu/packages/lisp.scm                              |  13 +-
 gnu/packages/llvm.scm                              | 100 ++--
 gnu/packages/logging.scm                           |   2 +-
 gnu/packages/machine-learning.scm                  |  89 ++++
 gnu/packages/minetest.scm                          |  36 ++
 gnu/packages/networking.scm                        | 422 +++++++++------
 gnu/packages/package-management.scm                |  14 +-
 gnu/packages/parallel.scm                          |   4 +-
 gnu/packages/patches/curl-use-ssl-cert-env.patch   |  26 +-
 gnu/packages/patches/dtc-meson-cell-overflow.patch |  32 ++
 .../patches/ffmpeg-jami-change-RTCP-ratio.patch    |  27 +
 .../ffmpeg-jami-libopusdec-enable-FEC.patch        | 127 +++++
 .../ffmpeg-jami-libopusenc-enable-FEC.patch        |  50 ++
 ...i-libopusenc-reload-packet-loss-at-encode.patch |  44 ++
 .../patches/ffmpeg-jami-remove-mjpeg-log.patch     |  26 +
 .../ffmpeg-jami-rtp_ext_abs_send_time.patch        |  71 +++
 .../ffmpeg-jami-screen-sharing-x11-fix.patch       | 302 +++++++++++
 .../patches/fifengine-python-3.9-compat.patch      |  81 +++
 .../patches/guile-fibers-libevent-timeout.patch    |  61 +++
 .../patches/jami-disable-integration-tests.patch   |  10 +-
 .../patches/jami-libjami-headers-search.patch      |   5 +-
 .../patches/jami-qml-tests-discovery.patch         |  15 +
 .../jami-skip-tests-requiring-internet.patch       |  51 ++
 .../patches/jami-unbundle-dependencies.patch       |  71 +++
 gnu/packages/patches/jdk-currency-time-bomb.patch  |  13 +
 gnu/packages/patches/jdk-currency-time-bomb2.patch |  13 +
 gnu/packages/patches/libjami-ac-config-files.patch |  52 ++
 .../patches/openjdk-currency-time-bomb.patch       |  13 +
 .../patches/openjdk-currency-time-bomb2.patch      |  13 +
 .../patches/python-pyreadstat-link-libiconv.patch  |  15 +
 gnu/packages/patches/python-uqbar-python3.10.patch |  23 +
 gnu/packages/patches/sbcl-fix-ppc64-build.patch    |  27 +
 gnu/packages/patches/sbcl-fix-riscv-build.patch    |  19 +
 .../patches/unknown-horizons-python-3.10.patch     |  32 ++
 .../patches/unknown-horizons-python-3.9.patch      |  41 ++
 gnu/packages/pdf.scm                               |  18 +-
 gnu/packages/potassco.scm                          |   2 +-
 gnu/packages/python-check.scm                      |  29 +-
 gnu/packages/python-compression.scm                |  34 ++
 gnu/packages/python-science.scm                    |   3 +-
 gnu/packages/python-web.scm                        | 173 +++++--
 gnu/packages/python-xyz.scm                        | 198 +++++--
 gnu/packages/radio.scm                             |  12 +-
 gnu/packages/rdf.scm                               |  37 +-
 gnu/packages/rust.scm                              |   6 +-
 gnu/packages/search.scm                            |   5 +-
 gnu/packages/serialization.scm                     |  78 ++-
 gnu/packages/statistics.scm                        |  79 ++-
 gnu/packages/suckless.scm                          |   5 +-
 gnu/packages/swig.scm                              |   4 +-
 gnu/packages/telephony.scm                         |  71 ++-
 gnu/packages/terminals.scm                         |   6 +-
 gnu/packages/text-editors.scm                      |   5 +-
 gnu/packages/textutils.scm                         |   4 +-
 gnu/packages/tls.scm                               |   7 +-
 gnu/packages/tor.scm                               |  17 +-
 gnu/packages/valgrind.scm                          |   4 +-
 gnu/packages/version-control.scm                   | 267 ++++++----
 gnu/packages/video.scm                             | 437 +++++++++++++---
 gnu/packages/vim.scm                               |  18 +-
 gnu/packages/web-browsers.scm                      |   4 +-
 gnu/packages/web.scm                               |  24 +-
 gnu/packages/wm.scm                                |   7 +-
 gnu/packages/xorg.scm                              |  10 +-
 gnu/services/guix.scm                              |   4 +-
 gnu/services/messaging.scm                         |  53 +-
 gnu/services/shepherd.scm                          |  30 +-
 gnu/services/ssh.scm                               |   7 +-
 gnu/system.scm                                     |   4 +-
 gnu/system/hurd.scm                                |   4 +-
 gnu/system/image.scm                               |  41 +-
 gnu/tests/data/jami-dummy-account.dat              | 127 +++--
 gnu/tests/docker.scm                               |   2 +-
 gnu/tests/security.scm                             |   5 +-
 gnu/tests/telephony.scm                            |   7 +-
 gnu/tests/virtualization.scm                       |   3 +-
 guix/build-system/zig.scm                          | 118 ++++-
 guix/build/zig-build-system.scm                    |   7 +-
 guix/docker.scm                                    | 212 ++++++--
 guix/import/crate.scm                              | 161 ++++--
 guix/read-print.scm                                |   1 +
 guix/scripts/import/crate.scm                      |  24 +-
 guix/scripts/pack.scm                              |  88 +++-
 guix/scripts/size.scm                              |   3 +-
 guix/scripts/system.scm                            |  31 +-
 tests/crate.scm                                    | 576 ++++++++++++++++++---
 tests/pack.scm                                     |  50 ++
 129 files changed, 5963 insertions(+), 1973 deletions(-)

diff --cc gnu/local.mk
index 1f8505ebfb,bb78815a59..3f06372b91
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -60,9 -60,9 +60,10 @@@
  # 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>
+ # Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
  #
  # This file is part of GNU Guix.
  #
diff --cc gnu/packages/gnome.scm
index d17676f53b,b43e533769..3d89f06d6a
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -4775,13 -4777,19 +4775,15 @@@ GLib and GObject, and integrates JSON w
                          (lambda _
                            (mkdir-p (string-append #$output:doc "/share"))
                            (rename-file
 -                           (string-append #$output "/share/gtk-doc")
 +                           (string-append #$output "/share/doc")
                             (string-append #$output:doc
 -                                          "/share/gtk-doc"))))))))))
 +                                          "/share/doc"))))))))))
      (native-inputs
-      (modify-inputs (package-native-inputs json-glib-minimal)
-        (prepend gi-docgen
-                 gobject-introspection)))))
+      (if (%current-target-system)
+          ;; No docs, no additional inputs.
+          (package-native-inputs json-glib-minimal)
+          (modify-inputs (package-native-inputs json-glib-minimal)
 -                        (prepend docbook-xml-4.3
 -                                 docbook-xsl
 -                                 gobject-introspection
 -                                 gtk-doc
 -                                 libxslt))))))
++                        (prepend gi-docgen gobject-introspection))))))
  
  (define-public libxklavier
    (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]