guix-commits
[Top][All Lists]
Advanced

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

01/40: Merge branch 'ungrafting' into staging


From: guix-commits
Subject: 01/40: Merge branch 'ungrafting' into staging
Date: Sun, 13 Dec 2020 15:46:11 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit d13ed52da216ece35af8e4f4ae413eb05912794b
Merge: bdfdb9d a7737f0
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Dec 13 20:50:50 2020 +0100

    Merge branch 'ungrafting' into staging

 Makefile.am                                        |    1 +
 config-daemon.ac                                   |    3 +-
 configure.ac                                       |   12 +-
 doc/guix.texi                                      |   80 +-
 etc/guix-daemon.cil.in                             |    4 +-
 etc/news.scm                                       |   26 +-
 gnu/build/linux-container.scm                      |    2 +-
 gnu/installer.scm                                  |    7 +
 gnu/installer/newt.scm                             |    5 +
 gnu/installer/newt/substitutes.scm                 |   43 +
 gnu/installer/proxy.scm                            |    6 +-
 gnu/installer/record.scm                           |    3 +
 gnu/installer/{proxy.scm => substitutes.scm}       |   20 +-
 gnu/installer/utils.scm                            |   11 +-
 gnu/local.mk                                       |   15 +-
 gnu/packages/admin.scm                             |   19 +-
 gnu/packages/audio.scm                             |    4 +-
 gnu/packages/autotools.scm                         |   35 +-
 gnu/packages/aux-files/guile-launcher.c            |   46 +-
 gnu/packages/backup.scm                            |   44 -
 gnu/packages/benchmark.scm                         |    4 +-
 gnu/packages/bioconductor.scm                      | 1383 +++++++++++++-------
 gnu/packages/bioinformatics.scm                    |  499 ++++---
 gnu/packages/busybox.scm                           |   16 +-
 gnu/packages/ci.scm                                |    8 +-
 gnu/packages/cran.scm                              |  939 ++++++++++---
 gnu/packages/crates-graphics.scm                   |   37 +-
 gnu/packages/crates-io.scm                         |  477 ++++++-
 gnu/packages/cups.scm                              |    7 +-
 gnu/packages/curl.scm                              |   58 +-
 gnu/packages/cybersecurity.scm                     |    5 +-
 gnu/packages/databases.scm                         |   12 +
 gnu/packages/dictionaries.scm                      |    4 +-
 gnu/packages/diffoscope.scm                        |    4 +-
 gnu/packages/dns.scm                               |   11 +-
 gnu/packages/ebook.scm                             |   28 +
 gnu/packages/emacs-xyz.scm                         |  433 ++++--
 gnu/packages/emulators.scm                         |    2 +-
 gnu/packages/engineering.scm                       |   35 +-
 gnu/packages/fcitx5.scm                            |  450 +++++++
 gnu/packages/finance.scm                           |   74 +-
 gnu/packages/fontutils.scm                         |   73 +-
 gnu/packages/game-development.scm                  |   35 +-
 gnu/packages/games.scm                             |    4 +-
 gnu/packages/ghostscript.scm                       |    4 +-
 gnu/packages/gimp.scm                              |   95 +-
 gnu/packages/gl.scm                                |   61 +
 gnu/packages/glib.scm                              |   29 +-
 gnu/packages/gnome.scm                             |    4 +-
 gnu/packages/gnucash.scm                           |   18 +-
 gnu/packages/gnuzilla.scm                          |    4 +-
 gnu/packages/golang.scm                            |  256 +++-
 gnu/packages/gtk.scm                               |   13 +-
 gnu/packages/guile-xyz.scm                         |   85 +-
 gnu/packages/haskell-crypto.scm                    |   36 +
 gnu/packages/haskell-web.scm                       |  250 +++-
 gnu/packages/image-viewers.scm                     |    4 +-
 gnu/packages/image.scm                             |   80 +-
 gnu/packages/javascript.scm                        |   21 +
 gnu/packages/kde-frameworks.scm                    |    2 +-
 gnu/packages/kde-internet.scm                      |    4 +-
 gnu/packages/kde-multimedia.scm                    |    4 +-
 gnu/packages/kde-pim.scm                           |   30 +-
 gnu/packages/kde-plasma.scm                        |    4 +-
 gnu/packages/kde.scm                               |   53 +-
 gnu/packages/linux.scm                             |   44 +-
 gnu/packages/lisp-xyz.scm                          |  136 +-
 gnu/packages/machine-learning.scm                  |    4 +-
 gnu/packages/mail.scm                              |   19 +-
 gnu/packages/maths.scm                             |   64 +-
 gnu/packages/matrix.scm                            |    4 +-
 gnu/packages/monitoring.scm                        |    4 +-
 gnu/packages/networking.scm                        |   13 +
 gnu/packages/nfs.scm                               |    5 +-
 gnu/packages/node.scm                              |   22 +-
 gnu/packages/ntp.scm                               |    4 +-
 gnu/packages/ocaml.scm                             |   16 +-
 gnu/packages/openldap.scm                          |   49 +-
 gnu/packages/package-management.scm                |   22 +-
 gnu/packages/password-utils.scm                    |    8 +-
 .../busybox-1.31.1-fix-build-with-glibc-2.31.patch |   68 -
 .../patches/ghostscript-CVE-2020-15900.patch       |   36 +
 .../patches/ghostscript-freetype-compat.patch      |   35 +
 gnu/packages/patches/hplip-fix-bug-1898438.patch   |   19 -
 .../knot-resolver-fix-map-command-on-32-bit.patch  |  146 ---
 gnu/packages/patches/libssh2-CVE-2019-17498.patch  |  126 ++
 .../patches/minimap2-aarch64-support.patch         |   52 +
 gnu/packages/patches/pam-mount-luks2-support.patch |   51 -
 gnu/packages/patches/pciutils-hurd-fix.patch       |   23 +
 gnu/packages/patches/python-CVE-2020-26116.patch   |   47 +
 .../patches/renpy-use-system-fribidi.patch         |   52 +
 .../patches/sbcl-geco-fix-organism-class.patch     |   13 -
 gnu/packages/pciutils.scm                          |   15 +-
 gnu/packages/python-web.scm                        |    4 +-
 gnu/packages/python-xyz.scm                        |   38 +-
 gnu/packages/python.scm                            |    1 +
 gnu/packages/ruby.scm                              |    4 +-
 gnu/packages/ssh.scm                               |    5 +-
 gnu/packages/statistics.scm                        |   92 +-
 gnu/packages/text-editors.scm                      |   41 +
 gnu/packages/tls.scm                               |   76 +-
 gnu/packages/version-control.scm                   |   62 +
 gnu/packages/video.scm                             |   21 +-
 gnu/packages/vim.scm                               |   36 +-
 gnu/packages/virtualization.scm                    |    4 +-
 gnu/packages/visidata.scm                          |    4 +-
 gnu/packages/vpn.scm                               |   33 +-
 gnu/packages/web-browsers.scm                      |    8 +-
 gnu/packages/web.scm                               |  206 ++-
 gnu/packages/wm.scm                                |   71 +
 gnu/packages/xdisorg.scm                           |   41 +
 gnu/packages/xfce.scm                              |   13 +-
 gnu/packages/xorg.scm                              |   20 +-
 gnu/services/audio.scm                             |    6 +-
 gnu/services/avahi.scm                             |    4 +-
 gnu/services/base.scm                              |   36 +-
 gnu/services/cuirass.scm                           |    4 +
 gnu/services/monitoring.scm                        |   81 +-
 gnu/services/science.scm                           |   18 +
 gnu/services/security-token.scm                    |    3 +-
 gnu/services/virtualization.scm                    |   15 +-
 gnu/system/install.scm                             |    6 +
 guix/avahi.scm                                     |    9 +-
 guix/build-system/r.scm                            |    2 +-
 guix/ci.scm                                        |   10 +
 guix/download.scm                                  |   21 +-
 guix/glob.scm                                      |   15 +
 guix/http-client.scm                               |   12 +-
 guix/import/cran.scm                               |   10 +-
 guix/import/opam.scm                               |   58 +-
 guix/import/utils.scm                              |    4 +-
 guix/profiles.scm                                  |   52 +-
 guix/progress.scm                                  |    8 +-
 guix/scripts/import/cran.scm                       |    9 +-
 guix/scripts/import/opam.scm                       |   10 +-
 guix/scripts/substitute.scm                        |  253 ++--
 guix/self.scm                                      |   26 +-
 guix/store/database.scm                            |    2 -
 m4/guix.m4                                         |    4 +-
 nix/libstore/build.cc                              |  173 +--
 nix/libstore/local-store.cc                        |  170 +--
 nix/libstore/local-store.hh                        |   25 +-
 nix/libutil/util.cc                                |    6 +-
 nix/libutil/util.hh                                |    7 +-
 po/guix/POTFILES.in                                |    1 +
 scripts/guix.in                                    |    2 +-
 tests/glob.scm                                     |    8 +-
 tests/lint.scm                                     |   33 +-
 tests/opam.scm                                     |   67 +-
 tests/profiles.scm                                 |   38 +
 tests/substitute.scm                               |   98 +-
 151 files changed, 6645 insertions(+), 2579 deletions(-)




reply via email to

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