guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into HEAD


From: guix-commits
Subject: 01/01: Merge branch 'master' into HEAD
Date: Sun, 3 Dec 2023 01:31:22 -0500 (EST)

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

commit 4c323c2f8308bba0e3295f3109d159c7b8f72838
Merge: 260b054aea 06ebc45e15
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sun Dec 3 07:20:53 2023 +0100

    Merge branch 'master' into HEAD
    
    Change-Id: I3f5d121162d98ef2ae61a62c4da3b0fd19d864e8

 doc/contributing.texi                              |     2 +-
 doc/guix.texi                                      |   145 +-
 etc/teams.scm                                      |     1 +
 gnu/build/linux-boot.scm                           |     8 +-
 gnu/home/services/ssh.scm                          |     8 +-
 gnu/installer.scm                                  |     7 +-
 gnu/local.mk                                       |    12 +-
 gnu/packages/admin.scm                             |     6 +-
 gnu/packages/algebra.scm                           |     4 +-
 gnu/packages/aspell.scm                            |     4 +-
 gnu/packages/audio.scm                             |     4 +-
 gnu/packages/backup.scm                            |   103 +-
 gnu/packages/base.scm                              |    24 +
 gnu/packages/benchmark.scm                         |     4 +-
 gnu/packages/bittorrent.scm                        |    17 +-
 gnu/packages/books.scm                             |     6 +-
 gnu/packages/bootloaders.scm                       |    67 +-
 gnu/packages/c.scm                                 |    55 +
 gnu/packages/chromium.scm                          |     2 +-
 gnu/packages/ci.scm                                |     8 +-
 gnu/packages/clifm.scm                             |    62 +
 gnu/packages/commencement.scm                      |    22 +-
 gnu/packages/conky.scm                             |     6 +-
 gnu/packages/coq.scm                               |    27 +
 gnu/packages/cpp.scm                               |    41 +-
 gnu/packages/curl.scm                              |    65 +-
 gnu/packages/datastructures.scm                    |    45 +-
 gnu/packages/dav.scm                               |    10 +-
 gnu/packages/debian.scm                            |     4 +-
 gnu/packages/diffoscope.scm                        |     4 +-
 gnu/packages/disk.scm                              |    71 +-
 gnu/packages/dlang.scm                             |     4 +-
 gnu/packages/dns.scm                               |     4 +-
 gnu/packages/docker.scm                            |     7 +-
 gnu/packages/emacs-xyz.scm                         |   346 +-
 gnu/packages/embedded.scm                          |     4 +-
 gnu/packages/emulators.scm                         |    27 +-
 gnu/packages/fcitx5.scm                            |    37 +-
 gnu/packages/finance.scm                           |     4 +-
 gnu/packages/flashing-tools.scm                    |     7 +-
 gnu/packages/fonts.scm                             |    12 +-
 gnu/packages/game-development.scm                  |     4 +-
 gnu/packages/geo.scm                               |    14 +-
 gnu/packages/gl.scm                                |    14 +-
 gnu/packages/gnome.scm                             |    15 +-
 gnu/packages/gnuzilla.scm                          |    12 +-
 gnu/packages/golang.scm                            |   214 +-
 gnu/packages/graph.scm                             |   114 +-
 gnu/packages/graphics.scm                          |     4 +
 gnu/packages/guile-xyz.scm                         |    33 +-
 gnu/packages/guile.scm                             |     4 +-
 gnu/packages/haskell-apps.scm                      |    52 +-
 gnu/packages/haskell-xyz.scm                       |    98 +-
 gnu/packages/instrumentation.scm                   |    25 +-
 gnu/packages/java.scm                              |    16 +-
 gnu/packages/javascript.scm                        |     2 +-
 gnu/packages/language.scm                          |     4 +-
 gnu/packages/linux.scm                             |    57 +-
 gnu/packages/lisp-check.scm                        |    29 +
 gnu/packages/lisp-xyz.scm                          |   139 +-
 gnu/packages/lisp.scm                              |     8 +-
 gnu/packages/llvm.scm                              |    55 +-
 gnu/packages/lua.scm                               |    33 +
 gnu/packages/machine-learning.scm                  |   113 +-
 gnu/packages/mail.scm                              |   110 +-
 gnu/packages/markup.scm                            |    15 +-
 gnu/packages/maths.scm                             |   236 +-
 gnu/packages/mes.scm                               |    16 +-
 gnu/packages/mpd.scm                               |    26 +-
 gnu/packages/networking.scm                        |   129 +-
 gnu/packages/package-management.scm                |    22 +-
 gnu/packages/parallel.scm                          |     4 +-
 gnu/packages/patches/aria2-unbundle-wslay.patch    |    54 +
 gnu/packages/patches/ghc-basement-fix-32bit.patch  |   177 +
 gnu/packages/patches/ghc-bloomfilter-ghc9.2.patch  |   303 -
 gnu/packages/patches/ghc-memory-fix-32bit.patch    |    40 +
 .../patches/ghc-persistent-fix-32bit.patch         |    25 +
 .../patches/go-gopkg-in-yaml-v3-32bit.patch        |    50 +
 .../patches/igraph-fix-varargs-integer-size.patch  |    39 +
 .../patches/php-fix-streams-copy-length.patch      |    52 -
 gnu/packages/patches/plasp-fix-normalization.patch |    51 +
 gnu/packages/patches/plasp-include-iostream.patch  |    26 +
 .../python-sphinx-prompt-docutils-0.19.patch       |    35 +
 gnu/packages/patches/scilab-hdf5-1.8-api.patch     |    71 -
 gnu/packages/patches/yggdrasil-extra-config.patch  |   134 +-
 gnu/packages/php.scm                               |   194 +-
 gnu/packages/potassco.scm                          |    54 +
 gnu/packages/protobuf.scm                          |     8 +-
 gnu/packages/python-xyz.scm                        |    52 +-
 gnu/packages/qt.scm                                |     5 +-
 gnu/packages/raspberry-pi.scm                      |     2 +-
 gnu/packages/samba.scm                             |    32 +
 gnu/packages/sdl.scm                               |    17 +-
 gnu/packages/shells.scm                            |     4 +-
 gnu/packages/sphinx.scm                            |     4 +-
 gnu/packages/ssh.scm                               |     4 +-
 gnu/packages/suckless.scm                          |     2 +-
 gnu/packages/tbb.scm                               |    29 +-
 gnu/packages/terminals.scm                         |    64 +-
 gnu/packages/tex.scm                               |     3 +-
 gnu/packages/textutils.scm                         |    30 +-
 gnu/packages/tls.scm                               |     4 +-
 gnu/packages/toys.scm                              |     2 +
 gnu/packages/version-control.scm                   |     5 +-
 gnu/packages/video.scm                             |   100 +-
 gnu/packages/vim.scm                               |   153 +
 gnu/packages/vpn.scm                               |     4 +-
 gnu/packages/vulkan.scm                            |    33 +
 gnu/packages/web-browsers.scm                      |    17 +-
 gnu/packages/web.scm                               |    58 +-
 gnu/packages/xdisorg.scm                           |    52 +-
 gnu/packages/xorg.scm                              |    50 +-
 gnu/packages/zig.scm                               |   215 +-
 gnu/services.scm                                   |     4 +-
 gnu/services/base.scm                              |     7 +-
 gnu/services/docker.scm                            |   260 +-
 gnu/services/guix.scm                              |    23 +-
 gnu/services/rsync.scm                             |     1 +
 gnu/services/vnc.scm                               |     2 +-
 gnu/services/web.scm                               |     6 +-
 gnu/system/image.scm                               |    13 +-
 gnu/system/install.scm                             |     2 +-
 guix/build-system/clojure.scm                      |     4 +-
 guix/build-system/guile.scm                        |     8 +-
 guix/build-system/meson.scm                        |     2 +
 guix/build-system/vim.scm                          |    17 +-
 guix/build/syscalls.scm                            |    26 +-
 guix/git.scm                                       |    39 +-
 guix/packages.scm                                  |     6 +-
 guix/profiles.scm                                  |    37 +-
 guix/progress.scm                                  |     3 +-
 guix/read-print.scm                                |     1 +
 guix/scripts/locate.scm                            |    24 +-
 guix/scripts/pack.scm                              |     8 +-
 guix/scripts/shell.scm                             |     7 +
 guix/scripts/style.scm                             |     2 +
 guix/self.scm                                      |     5 +-
 po/doc/guix-cookbook.fr.po                         |    95 +-
 po/doc/guix-manual.de.po                           | 26677 ++++++++++---------
 po/guix/LINGUAS                                    |     1 +
 po/guix/{zh_CN.po => ca.po}                        |  1627 +-
 po/guix/zh_CN.po                                   |     9 +-
 tests/gexp.scm                                     |    59 +-
 tests/pack.scm                                     |     7 +-
 tests/profiles.scm                                 |     4 +-
 tests/read-print.scm                               |     5 +
 tests/syscalls.scm                                 |    10 +-
 147 files changed, 18228 insertions(+), 15940 deletions(-)

diff --cc gnu/local.mk
index 5cb9874d9f,fd90b954a9..93477f830b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -918,9 -918,9 +919,10 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
    %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
    %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \
 +  %D%/packages/patches/appstream-force-reload-stemmer.patch   \
    %D%/packages/patches/apr-fix-atomics.patch                  \
    %D%/packages/patches/apr-skip-getservbyname-test.patch      \
+   %D%/packages/patches/aria2-unbundle-wslay.patch             \
    %D%/packages/patches/ark-skip-xar-test.patch                        \
    %D%/packages/patches/arpack-ng-propagate-rng-state.patch    \
    %D%/packages/patches/asli-use-system-libs.patch             \



reply via email to

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