guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge remote-tracking branch 'savannah/master' into gnome-team


From: guix-commits
Subject: 01/01: Merge remote-tracking branch 'savannah/master' into gnome-team
Date: Wed, 20 Mar 2024 11:00:49 -0400 (EDT)

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

commit 8fa07612644339a2bf21be9ee924e6ff1e0ec81d
Merge: ebe30c3754 69951a61a1
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Mar 20 14:54:26 2024 +0000

    Merge remote-tracking branch 'savannah/master' into gnome-team
    
    Change-Id: Iec8e15b79c6fde516294c2bfcaf8ee3575b1f745

 doc/guix-cookbook.texi                             |  17 +-
 doc/guix.texi                                      |  19 +-
 etc/teams/qt/common.scm                            |   4 -
 etc/teams/qt/qt-manifest.scm                       |   4 -
 etc/teams/qt/qt5-manifest.scm                      |   4 -
 gnu/local.mk                                       |   2 +-
 gnu/packages/admin.scm                             | 126 ++--
 gnu/packages/algebra.scm                           |   6 +-
 gnu/packages/audio.scm                             |  37 +-
 gnu/packages/bioconductor.scm                      |   6 +-
 gnu/packages/bioinformatics.scm                    |  63 --
 gnu/packages/cran.scm                              | 173 +++--
 gnu/packages/databases.scm                         |   4 +-
 gnu/packages/dns.scm                               |   8 +-
 gnu/packages/docker.scm                            |  10 +-
 gnu/packages/documentation.scm                     |  45 +-
 gnu/packages/education.scm                         |   4 +-
 gnu/packages/emacs-xyz.scm                         | 762 +++++++++++----------
 gnu/packages/emulators.scm                         |  17 +-
 gnu/packages/finance.scm                           | 118 +++-
 gnu/packages/fonts.scm                             |  96 ++-
 gnu/packages/fontutils.scm                         |   6 +-
 gnu/packages/freedesktop.scm                       |   6 +-
 gnu/packages/games.scm                             |  48 +-
 gnu/packages/gnuzilla.scm                          |  12 +-
 gnu/packages/golang-check.scm                      |  25 +
 gnu/packages/golang-compression.scm                |  45 +-
 gnu/packages/golang-web.scm                        |  39 ++
 gnu/packages/golang-xyz.scm                        | 130 ++++
 gnu/packages/javascript.scm                        |  20 +-
 gnu/packages/lisp-xyz.scm                          |  79 ++-
 gnu/packages/lisp.scm                              |   4 +-
 gnu/packages/logging.scm                           |  11 +-
 gnu/packages/maths.scm                             |   6 +
 gnu/packages/music.scm                             |  48 +-
 gnu/packages/ocr.scm                               |   6 +-
 gnu/packages/package-management.scm                |   6 +-
 gnu/packages/password-utils.scm                    |   6 +-
 gnu/packages/patches/qemu-build-info-manual.patch  |  37 +-
 ...s.patch => qemu-disable-bios-tables-test.patch} |  36 +-
 gnu/packages/pdf.scm                               |   4 +-
 gnu/packages/plotutils.scm                         |   4 +-
 gnu/packages/python-web.scm                        |  57 ++
 gnu/packages/python-xyz.scm                        | 175 ++++-
 gnu/packages/qt.scm                                |  43 +-
 gnu/packages/security-token.scm                    |  49 +-
 gnu/packages/statistics.scm                        |  12 +-
 gnu/packages/text-editors.scm                      |  10 +-
 gnu/packages/virtualization.scm                    |  25 +-
 gnu/packages/weather.scm                           |   6 +-
 gnu/packages/web-browsers.scm                      |   8 +-
 gnu/packages/wine.scm                              |  12 +-
 gnu/packages/wm.scm                                |  86 ++-
 gnu/packages/xdisorg.scm                           |  26 +-
 gnu/packages/xfce.scm                              |  69 +-
 gnu/services/messaging.scm                         |   6 +
 gnu/services/sddm.scm                              |   7 +-
 gnu/services/xorg.scm                              |   2 +
 gnu/tests/messaging.scm                            |   2 +-
 guix/describe.scm                                  |  48 +-
 guix/profiles.scm                                  |   4 +-
 guix/scripts/git/authenticate.scm                  |   2 +
 62 files changed, 1782 insertions(+), 970 deletions(-)

diff --cc gnu/packages/freedesktop.scm
index fc3c2b3e29,a1b259ef8a..89634cf914
--- 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.
  ;;;



reply via email to

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