guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging.


From: guix-commits
Subject: 01/01: Merge branch 'master' into staging.
Date: Wed, 8 Feb 2023 10:17:30 -0500 (EST)

apteryx pushed a commit to branch staging
in repository guix.

commit d88cee1d44a475b6ea276e87a4c98682255b881e
Merge: d2b9b4b861 20059f92a9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Feb 8 09:41:45 2023 -0500

    Merge branch 'master' into staging.
    
    With conflicts resolved in:
            gnu/packages/version-control.scm

 .dir-locals.el                                     |     3 +-
 Makefile.am                                        |     4 -
 doc/contributing.texi                              |    50 +-
 doc/guix.texi                                      |  1633 ++-
 etc/news.scm                                       |    81 +-
 etc/release-manifest.scm                           |     2 +-
 etc/teams.scm.in                                   |    15 +-
 gnu/bootloader/u-boot.scm                          |    18 +
 gnu/build/linux-container.scm                      |    17 +-
 gnu/home/services/fontutils.scm                    |    18 +-
 gnu/local.mk                                       |    19 +-
 gnu/packages.scm                                   |    16 +-
 gnu/packages/accessibility.scm                     |     2 +-
 gnu/packages/admin.scm                             |    51 +-
 gnu/packages/algebra.scm                           |    14 +-
 gnu/packages/animation.scm                         |     4 +-
 gnu/packages/astronomy.scm                         |    61 +-
 gnu/packages/audio.scm                             |   226 +-
 gnu/packages/autotools.scm                         |     2 +-
 gnu/packages/aux-files/linux-libre/6.0-arm.conf    | 10602 -----------------
 gnu/packages/aux-files/linux-libre/6.0-arm64.conf  | 11101 ------------------
 gnu/packages/aux-files/linux-libre/6.0-i686.conf   | 11482 ------------------
 gnu/packages/aux-files/linux-libre/6.0-x86_64.conf | 11619 -------------------
 gnu/packages/backup.scm                            |     7 +-
 gnu/packages/bioconductor.scm                      |   662 +-
 gnu/packages/bioinformatics.scm                    |   595 +-
 gnu/packages/bootloaders.scm                       |   554 +-
 gnu/packages/bootstrap.scm                         |     3 +-
 gnu/packages/build-tools.scm                       |   202 +
 gnu/packages/busybox.scm                           |     6 +-
 gnu/packages/c.scm                                 |    14 +-
 gnu/packages/check.scm                             |    18 +
 gnu/packages/chemistry.scm                         |   101 +-
 gnu/packages/chromium.scm                          |    38 +-
 gnu/packages/ci.scm                                |     8 +-
 gnu/packages/cinnamon.scm                          |    81 +
 gnu/packages/cmake.scm                             |     4 +-
 gnu/packages/code.scm                              |     4 +-
 gnu/packages/commencement.scm                      |     2 +-
 gnu/packages/compression.scm                       |    39 +-
 gnu/packages/compton.scm                           |    22 +-
 gnu/packages/configuration-management.scm          |     2 +-
 gnu/packages/containers.scm                        |    43 +-
 gnu/packages/cpp.scm                               |    62 +-
 gnu/packages/cran.scm                              |   209 +-
 gnu/packages/crates-io.scm                         |     6 +-
 gnu/packages/crypto.scm                            |     9 +-
 gnu/packages/databases.scm                         |     8 +-
 gnu/packages/debug.scm                             |     4 +-
 gnu/packages/dezyne.scm                            |     6 +-
 gnu/packages/diffoscope.scm                        |   161 +-
 gnu/packages/disk.scm                              |    13 +-
 gnu/packages/dns.scm                               |     4 +-
 gnu/packages/documentation.scm                     |    43 +-
 gnu/packages/education.scm                         |    10 +-
 gnu/packages/elf.scm                               |    31 +-
 gnu/packages/emacs-xyz.scm                         |  1871 ++-
 gnu/packages/emacs.scm                             |    13 +-
 gnu/packages/emulators.scm                         |    64 +-
 gnu/packages/engineering.scm                       |   107 +-
 gnu/packages/enlightenment.scm                     |   134 +-
 gnu/packages/erlang.scm                            |     4 +-
 gnu/packages/fcitx5.scm                            |    36 +-
 gnu/packages/file-systems.scm                      |   182 +-
 gnu/packages/finance.scm                           |    57 +-
 gnu/packages/firmware.scm                          |   147 +-
 gnu/packages/fonts.scm                             |    67 +-
 gnu/packages/fpga.scm                              |     7 +-
 gnu/packages/freedesktop.scm                       |    12 +-
 gnu/packages/game-development.scm                  |    35 +-
 gnu/packages/games.scm                             |    16 +-
 gnu/packages/geo.scm                               |    98 +-
 gnu/packages/gnome-xyz.scm                         |    39 +-
 gnu/packages/gnome.scm                             |   113 +-
 gnu/packages/gnuzilla.scm                          |    20 +-
 gnu/packages/golang.scm                            |   756 +-
 gnu/packages/graph.scm                             |   201 +-
 gnu/packages/graphics.scm                          |   102 +-
 gnu/packages/gstreamer.scm                         |     3 +-
 gnu/packages/gtk.scm                               |    32 +-
 gnu/packages/guile-xyz.scm                         |   382 +-
 gnu/packages/guile.scm                             |    29 +-
 gnu/packages/hardware.scm                          |    23 +-
 gnu/packages/haskell-apps.scm                      |    14 +-
 gnu/packages/haskell-xyz.scm                       |    24 +
 gnu/packages/haskell.scm                           |     4 +-
 gnu/packages/image-viewers.scm                     |    26 +-
 gnu/packages/image.scm                             |    35 +-
 gnu/packages/inkscape.scm                          |     4 +-
 gnu/packages/irc.scm                               |    23 +-
 gnu/packages/jami.scm                              |   113 +-
 gnu/packages/java.scm                              |    64 +-
 gnu/packages/julia-jll.scm                         |    44 +
 gnu/packages/julia-xyz.scm                         |    92 +-
 gnu/packages/kde.scm                               |     1 +
 gnu/packages/key-mon.scm                           |    28 -
 gnu/packages/less.scm                              |     4 +-
 gnu/packages/libusb.scm                            |    10 +-
 gnu/packages/linux.scm                             |   298 +-
 gnu/packages/lirc.scm                              |    24 +-
 gnu/packages/lisp-xyz.scm                          |   179 +-
 gnu/packages/lisp.scm                              |     8 +-
 gnu/packages/lxqt.scm                              |    10 +-
 gnu/packages/machine-learning.scm                  |    52 +-
 gnu/packages/mail.scm                              |    68 +-
 gnu/packages/make-bootstrap.scm                    |    10 +-
 gnu/packages/man.scm                               |     4 +-
 gnu/packages/maths.scm                             |    11 +-
 gnu/packages/messaging.scm                         |    16 +-
 gnu/packages/moreutils.scm                         |     9 +-
 gnu/packages/mpd.scm                               |    86 +-
 gnu/packages/mpi.scm                               |    19 +-
 gnu/packages/music.scm                             |   688 +-
 gnu/packages/nettle.scm                            |    10 +-
 gnu/packages/networking.scm                        |    81 +-
 gnu/packages/ocaml.scm                             |   203 +-
 gnu/packages/opencl.scm                            |     5 +-
 gnu/packages/package-management.scm                |   125 +-
 gnu/packages/password-utils.scm                    |    33 +
 gnu/packages/patches/azr3-remove-lash.patch        |   191 +
 gnu/packages/patches/azr3.patch                    |    12 +-
 .../bees-beesd-honor-destdir-on-installation.patch |    40 +
 .../patches/diffoscope-fix-llvm-test.patch         |    29 -
 .../patches/emacs-libgit-use-system-libgit2.patch  |    88 -
 .../patches/emacs-telega-path-placeholder.patch    |    41 +-
 gnu/packages/patches/gromacs-tinyxml2.patch        |    40 +-
 .../patches/guile-continuation-stack-leak.patch    |    27 -
 gnu/packages/patches/guile-cross-compilation.patch |    55 -
 .../patches/jami-libjami-headers-search.patch      |    18 +-
 gnu/packages/patches/lirc-reproducible-build.patch |    69 +-
 ...etri-foo-0.1.87-fix-recent-file-not-exist.patch |    24 +
 ...python-pypdf-annotate-tests-appropriately.patch |    96 +
 .../patches/qtwayland-cleanup-callbacks.patch      |    52 +
 .../qtwayland-dont-recreate-callbacks.patch        |    76 +
 gnu/packages/patches/rw-igraph-0.10.patch          |    17 +
 .../patches/timewarrior-time-sensitive-tests.patch |   163 +
 gnu/packages/patches/u-boot-patman-fix-help.patch  |    40 -
 .../patches/u-boot-patman-get-maintainer.patch     |   104 -
 .../patches/u-boot-patman-guix-integration.patch   |  1244 ++
 .../patches/u-boot-patman-local-conf.patch         |   176 -
 .../patches/xf86-video-qxl-fix-build.patch         |   101 -
 .../patches/xf86-video-voodoo-pcitag.patch         |    34 -
 gnu/packages/pdf.scm                               |    37 +-
 gnu/packages/perl.scm                              |    25 +
 gnu/packages/photo.scm                             |    40 +-
 gnu/packages/plotutils.scm                         |    20 +-
 gnu/packages/python-check.scm                      |    63 +-
 gnu/packages/python-web.scm                        |    88 +-
 gnu/packages/python-xyz.scm                        |   137 +-
 gnu/packages/qt.scm                                |    64 +-
 gnu/packages/radio.scm                             |    84 +-
 gnu/packages/raspberry-pi.scm                      |   122 +-
 gnu/packages/samba.scm                             |    55 +-
 gnu/packages/sawfish.scm                           |    73 +-
 gnu/packages/search.scm                            |     4 +-
 gnu/packages/ssh.scm                               |     8 +-
 gnu/packages/suckless.scm                          |    10 +-
 gnu/packages/sync.scm                              |    36 +-
 gnu/packages/syncthing.scm                         |     5 +-
 gnu/packages/task-management.scm                   |    53 +
 gnu/packages/terminals.scm                         |     5 +-
 gnu/packages/texinfo.scm                           |    27 +-
 gnu/packages/text-editors.scm                      |    50 +-
 gnu/packages/tls.scm                               |    44 +-
 gnu/packages/tor.scm                               |    22 +-
 gnu/packages/unicode.scm                           |     9 +-
 gnu/packages/upnp.scm                              |     4 +-
 gnu/packages/version-control.scm                   |    93 +-
 gnu/packages/video.scm                             |    60 +-
 gnu/packages/vim.scm                               |     6 +-
 gnu/packages/vulkan.scm                            |    12 +-
 gnu/packages/w3m.scm                               |     4 +-
 gnu/packages/web-browsers.scm                      |     4 +-
 gnu/packages/web.scm                               |   267 +-
 gnu/packages/webkit.scm                            |    47 +-
 gnu/packages/wine.scm                              |   320 +-
 gnu/packages/wm.scm                                |    97 +-
 gnu/packages/xdisorg.scm                           |    81 +-
 gnu/packages/xfce.scm                              |   306 +-
 gnu/packages/xml.scm                               |     4 +-
 gnu/packages/xorg.scm                              |   209 +-
 gnu/services/admin.scm                             |    20 +-
 gnu/services/audio.scm                             |   902 +-
 gnu/services/base.scm                              |     3 +
 gnu/services/dbus.scm                              |     2 +
 gnu/services/games.scm                             |    36 +-
 gnu/services/guix.scm                              |    85 +-
 gnu/services/networking.scm                        |    14 +-
 gnu/services/security.scm                          |    40 +-
 gnu/services/telephony.scm                         |     8 +-
 gnu/services/version-control.scm                   |     4 +-
 gnu/services/web.scm                               |    15 +-
 gnu/system/shadow.scm                              |     3 +
 gnu/tests/audio.scm                                |    53 +-
 gnu/tests/web.scm                                  |     7 +-
 guix/build-system/cargo.scm                        |     1 +
 guix/build-system/copy.scm                         |     4 +
 guix/build-system/dune.scm                         |     1 +
 guix/build-system/font.scm                         |     1 +
 guix/build-system/guile.scm                        |     2 +
 guix/build-system/meson.scm                        |     1 +
 guix/build-system/ocaml.scm                        |     1 +
 guix/build-system/ruby.scm                         |     1 +
 guix/build-system/scons.scm                        |     1 +
 guix/build-system/texlive.scm                      |     1 +
 guix/build-system/waf.scm                          |     1 +
 guix/build/debug-link.scm                          |    12 +-
 guix/build/dune-build-system.scm                   |     4 +-
 guix/channels.scm                                  |     6 +-
 guix/download.scm                                  |     8 +-
 guix/import/opam.scm                               |     4 +-
 guix/inferior.scm                                  |    70 +-
 guix/platform.scm                                  |    55 +-
 guix/scripts/container/exec.scm                    |    10 +-
 guix/scripts/environment.scm                       |    11 +-
 guix/scripts/graph.scm                             |    14 +-
 guix/scripts/repl.scm                              |    14 +-
 guix/transformations.scm                           |    91 +-
 guix/ui.scm                                        |     3 +
 po/packages/POTFILES.in                            |     1 -
 tests/containers.scm                               |    53 +-
 tests/guix-environment-container.sh                |    13 +-
 tests/guix-refresh.sh                              |     3 +-
 tests/transformations.scm                          |    19 +-
 224 files changed, 13554 insertions(+), 50362 deletions(-)




reply via email to

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