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: Sun, 18 Oct 2020 18:48:37 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 1a8f7a0f584e5dd6e8f1a379b92f689b71902295
Merge: 19d42e0 2a4f3c1
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Oct 19 00:17:48 2020 +0200

    Merge branch 'master' into staging

 .guix-authorizations                               |     6 +-
 Makefile.am                                        |     1 +
 doc/build.scm                                      |   457 +-
 doc/guix-cookbook.texi                             |   130 +-
 doc/guix.texi                                      |   404 +-
 etc/guix-install.sh                                |    37 +
 etc/news.scm                                       |    19 +
 gnu/bootloader/grub.scm                            |    18 +
 gnu/build/hurd-boot.scm                            |     4 +-
 gnu/installer.scm                                  |     3 +-
 gnu/local.mk                                       |     5 +-
 gnu/machine/ssh.scm                                |     3 +
 gnu/packages/admin.scm                             |    34 +-
 gnu/packages/aspell.scm                            |    51 +
 gnu/packages/audio.scm                             |    59 +-
 gnu/packages/aux-files/linux-libre/4.19-arm.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/4.19-arm64.conf |     3 +-
 gnu/packages/aux-files/linux-libre/4.19-i686.conf  |     3 +-
 .../aux-files/linux-libre/4.19-x86_64.conf         |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-arm.conf    |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-arm64.conf  |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-i686.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/5.4-x86_64.conf |     3 +-
 gnu/packages/aux-files/linux-libre/5.8-arm.conf    |     3 +-
 gnu/packages/aux-files/linux-libre/5.8-arm64.conf  |     3 +-
 gnu/packages/aux-files/linux-libre/5.8-i686.conf   |     3 +-
 gnu/packages/aux-files/linux-libre/5.8-x86_64.conf |     3 +-
 gnu/packages/build-tools.scm                       |     6 +-
 gnu/packages/c.scm                                 |    59 +
 gnu/packages/calendar.scm                          |    43 +
 gnu/packages/cdrom.scm                             |    19 +-
 gnu/packages/chromium.scm                          |   192 +-
 gnu/packages/ci.scm                                |     6 +-
 gnu/packages/cran.scm                              |    36 +-
 gnu/packages/databases.scm                         |    40 +-
 gnu/packages/debug.scm                             |    74 +
 gnu/packages/disk.scm                              |     4 +-
 gnu/packages/dns.scm                               |    33 +-
 gnu/packages/docker.scm                            |    64 +-
 gnu/packages/education.scm                         |    36 +-
 gnu/packages/emacs-xyz.scm                         |    90 +-
 gnu/packages/finance.scm                           |    26 +-
 gnu/packages/game-development.scm                  |    29 +
 gnu/packages/games.scm                             |     4 +-
 gnu/packages/geo.scm                               |    14 +-
 gnu/packages/gnome.scm                             |   129 +-
 gnu/packages/gnuzilla.scm                          |    18 +-
 gnu/packages/golang.scm                            |    90 +-
 gnu/packages/gps.scm                               |     4 +-
 gnu/packages/gtk.scm                               |     4 +-
 gnu/packages/haskell-apps.scm                      |     4 +-
 gnu/packages/image.scm                             |    46 +-
 gnu/packages/ipfs.scm                              |     4 +-
 gnu/packages/julia.scm                             |   113 +-
 gnu/packages/kde.scm                               |     4 +-
 gnu/packages/language.scm                          |     4 +-
 gnu/packages/libreoffice.scm                       |    38 +-
 gnu/packages/linux.scm                             |    43 +-
 gnu/packages/llvm.scm                              |   231 +-
 gnu/packages/logging.scm                           |    15 +-
 gnu/packages/lua.scm                               |   186 +-
 gnu/packages/mail.scm                              |   150 +-
 gnu/packages/matrix.scm                            |     5 +-
 gnu/packages/mpd.scm                               |    11 +-
 gnu/packages/music.scm                             |    83 +-
 gnu/packages/networking.scm                        |     4 +-
 gnu/packages/ocaml.scm                             |   372 +-
 gnu/packages/package-management.scm                |     6 +-
 gnu/packages/parallel.scm                          |    16 +-
 gnu/packages/password-utils.scm                    |    14 +-
 .../patches/clang-11.0-libc-search-path.patch      |    89 +
 gnu/packages/patches/nginx-socket-cloexec.patch    |   185 +
 .../patches/python-chardet-3.0.4-pytest.patch      |    15 -
 gnu/packages/patches/unison-fix-ocaml-4.08.patch   |    81 +
 gnu/packages/patches/xpra-4.0.4-norequests.patch   |    39 +
 gnu/packages/pdf.scm                               |     5 +-
 gnu/packages/perl.scm                              |     9 +-
 gnu/packages/photo.scm                             |    10 +-
 gnu/packages/prolog.scm                            |     4 +-
 gnu/packages/python-crypto.scm                     |    96 +-
 gnu/packages/python-web.scm                        |     9 +-
 gnu/packages/python-xyz.scm                        |   220 +-
 gnu/packages/radio.scm                             |     5 +-
 gnu/packages/shells.scm                            |     4 +-
 gnu/packages/syndication.scm                       |     3 +
 gnu/packages/tls.scm                               |     4 +-
 gnu/packages/toys.scm                              |   110 +-
 gnu/packages/uml.scm                               |     4 +-
 gnu/packages/version-control.scm                   |     4 +-
 gnu/packages/vim.scm                               |     4 +-
 gnu/packages/virtualization.scm                    |    49 +-
 gnu/packages/web-browsers.scm                      |     8 +-
 gnu/packages/web.scm                               |    72 +
 gnu/packages/xdisorg.scm                           |     3 +-
 gnu/packages/xfce.scm                              |     4 +-
 gnu/packages/xml.scm                               |     5 +-
 gnu/packages/xorg.scm                              |     7 +-
 gnu/services.scm                                   |     7 +-
 gnu/services/docker.scm                            |     6 +-
 gnu/services/web.scm                               |    27 +-
 gnu/system.scm                                     |    51 +-
 gnu/system/image.scm                               |     3 +-
 gnu/system/install.scm                             |    37 +-
 guix/build/go-build-system.scm                     |    13 +
 guix/gexp.scm                                      |    18 +-
 guix/import/utils.scm                              |    14 +-
 guix/licenses.scm                                  |    10 +
 guix/openpgp.scm                                   |     6 +-
 guix/scripts/system.scm                            |     2 +
 guix/ui.scm                                        |     3 +-
 po/doc/guix-manual.de.po                           | 27010 ++++++++++-------
 po/doc/guix-manual.es.po                           | 27052 ++++++++++-------
 po/doc/guix-manual.fr.po                           | 23550 ++++++++------
 po/guix/de.po                                      |  1898 +-
 po/guix/eo.po                                      |  6905 ++++-
 po/guix/es.po                                      |  1906 +-
 po/guix/fr.po                                      |  1875 +-
 po/guix/pt_BR.po                                   |  1952 +-
 po/packages/de.po                                  | 11127 ++++---
 po/packages/eo.po                                  | 30346 ++++++++++++++++++-
 po/packages/fr.po                                  | 11160 ++++---
 tests/boot-parameters.scm                          |   256 +
 tests/guix-build.sh                                |    27 +
 123 files changed, 103445 insertions(+), 46500 deletions(-)

diff --cc gnu/local.mk
index 8b09cb3,5a79c79..91b7c3a
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1360,8 -1363,10 +1361,9 @@@ dist_patch_DATA =                              
                
    %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch    \
    %D%/packages/patches/ngircd-handle-zombies.patch            \
    %D%/packages/patches/network-manager-plugin-path.patch      \
+   %D%/packages/patches/nginx-socket-cloexec.patch             \
    %D%/packages/patches/nsis-env-passthru.patch                        \
    %D%/packages/patches/nss-increase-test-timeout.patch                \
 -  %D%/packages/patches/nss-pkgconfig.patch                    \
    %D%/packages/patches/nss-3.56-pkgconfig.patch                       \
    %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch            \
    %D%/packages/patches/nvi-assume-preserve-path.patch         \
diff --cc gnu/packages/golang.scm
index 9fe3184,bf99fd2..0c9b269
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@@ -20,7 -20,7 +20,8 @@@
  ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
  ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.com>
  ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com>
 +;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
+ ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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