guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into core-updates


From: guix-commits
Subject: 01/01: Merge branch 'master' into core-updates
Date: Fri, 14 Feb 2020 13:16:23 -0500 (EST)

mbakke pushed a commit to branch core-updates
in repository guix.

commit 7edafc884c2a21258541b17a231051702c458263
Merge: 89da127 64fc4f3
Author: Marius Bakke <address@hidden>
AuthorDate: Fri Feb 14 19:05:45 2020 +0100

    Merge branch 'master' into core-updates

 .mailmap                                           |    1 +
 build-aux/git-authenticate.scm                     |    4 +
 doc/guix.texi                                      |   29 +-
 etc/completion/bash/guix                           |    2 +-
 etc/news.scm                                       |   43 +-
 gnu/installer.scm                                  |    7 +-
 gnu/installer/final.scm                            |   27 +-
 gnu/installer/newt/final.scm                       |   21 +-
 gnu/local.mk                                       |   10 +-
 gnu/machine.scm                                    |    2 +-
 gnu/machine/digital-ocean.scm                      |    2 +-
 gnu/machine/ssh.scm                                |    2 +-
 gnu/packages/admin.scm                             |   42 +-
 gnu/packages/aidc.scm                              |   39 +
 gnu/packages/antivirus.scm                         |    6 +-
 gnu/packages/backup.scm                            |    9 +-
 gnu/packages/bioconductor.scm                      |    6 +-
 gnu/packages/bioinformatics.scm                    |   15 +-
 gnu/packages/boost.scm                             |    4 +-
 gnu/packages/check.scm                             |   26 +
 gnu/packages/chicken.scm                           |   68 +
 gnu/packages/chromium.scm                          |    9 +-
 gnu/packages/cran.scm                              |   18 +-
 gnu/packages/crates-io.scm                         | 2516 ++++++++++--
 gnu/packages/crypto.scm                            |    7 +-
 gnu/packages/cups.scm                              |    4 +-
 gnu/packages/databases.scm                         |    4 +-
 gnu/packages/dictionaries.scm                      |    5 +-
 gnu/packages/diffoscope.scm                        |   74 +-
 gnu/packages/djvu.scm                              |   54 +-
 gnu/packages/dns.scm                               |    1 -
 gnu/packages/docker.scm                            |   21 +-
 gnu/packages/dunst.scm                             |   14 +-
 gnu/packages/education.scm                         |  113 +-
 gnu/packages/elf.scm                               |   24 +-
 gnu/packages/emacs-xyz.scm                         |  260 +-
 gnu/packages/file-systems.scm                      |    6 +-
 gnu/packages/finance.scm                           |    4 +-
 gnu/packages/fonts.scm                             |   22 +
 gnu/packages/fontutils.scm                         |    2 +-
 gnu/packages/freedesktop.scm                       |   17 +-
 gnu/packages/ftp.scm                               |    4 +-
 gnu/packages/games.scm                             |  443 ++-
 gnu/packages/gdb.scm                               |   10 +
 gnu/packages/gimp.scm                              |    4 +-
 gnu/packages/gl.scm                                |   19 +
 gnu/packages/gnome-xyz.scm                         |   34 +
 gnu/packages/gnome.scm                             |   51 +-
 gnu/packages/gnunet.scm                            |    2 +-
 gnu/packages/gnuzilla.scm                          |   12 +-
 gnu/packages/golang.scm                            |  416 +-
 gnu/packages/gpodder.scm                           |    6 +-
 gnu/packages/graph.scm                             |   29 +
 gnu/packages/graphics.scm                          |   13 +-
 gnu/packages/gstreamer.scm                         |   34 +
 gnu/packages/ham-radio.scm                         |   51 +-
 gnu/packages/haskell-xyz.scm                       |  109 +
 gnu/packages/i2p.scm                               |    2 +-
 gnu/packages/kde-internet.scm                      |    2 +-
 gnu/packages/libreoffice.scm                       |   34 +-
 gnu/packages/libusb.scm                            |   12 +-
 gnu/packages/linux.scm                             |   81 +-
 gnu/packages/lisp-xyz.scm                          |  767 +++-
 gnu/packages/lisp.scm                              |    4 +-
 gnu/packages/lua.scm                               |  159 +-
 gnu/packages/lxde.scm                              |    2 +-
 gnu/packages/lxqt.scm                              |   10 +
 gnu/packages/mail.scm                              |   11 +-
 gnu/packages/man.scm                               |    6 +-
 gnu/packages/maths.scm                             |    6 +-
 gnu/packages/messaging.scm                         |    2 +-
 gnu/packages/music.scm                             |   29 +-
 gnu/packages/musl.scm                              |    2 +-
 gnu/packages/nano.scm                              |    6 +-
 gnu/packages/networking.scm                        |   83 +
 gnu/packages/node.scm                              |    4 +
 gnu/packages/opencl.scm                            |   91 +
 gnu/packages/parallel.scm                          |    6 +-
 gnu/packages/password-utils.scm                    |   15 +-
 .../docker-adjust-tests-for-changes-in-go.patch    |   67 -
 .../patches/docker-engine-test-noinstall.patch     |   23 -
 .../patches/docker-use-fewer-modprobes.patch       |  137 -
 gnu/packages/patches/icecat-makeicecat.patch       |    4 +-
 .../isc-dhcp-4.4.1-fixes-for-newer-bind.patch      |  100 -
 gnu/packages/patches/libreoffice-glm.patch         |   58 -
 gnu/packages/patches/libreoffice-icu.patch         |  126 -
 gnu/packages/patches/lvm2-static-link.patch        |   29 +-
 .../patches/qrcodegen-cpp-make-install.patch       |  448 +++
 gnu/packages/patches/reprotest-support-guix.patch  |   79 +
 .../patches/rust-openssl-sys-no-vendor.patch       |   23 +
 gnu/packages/patchutils.scm                        |    4 +-
 gnu/packages/pdf.scm                               |   94 +
 gnu/packages/perl.scm                              |   21 +
 gnu/packages/protobuf.scm                          |    8 +-
 gnu/packages/pulseaudio.scm                        |   77 +
 gnu/packages/python-xyz.scm                        |  125 +-
 gnu/packages/rust-apps.scm                         |  222 +-
 gnu/packages/rust.scm                              |    2 +-
 gnu/packages/samba.scm                             |   26 +-
 gnu/packages/scanner.scm                           |    7 +
 gnu/packages/scheme.scm                            |   41 -
 gnu/packages/screen.scm                            |    6 +-
 gnu/packages/sdr.scm                               |    3 +-
 gnu/packages/serialization.scm                     |    2 +-
 gnu/packages/shells.scm                            |   37 +-
 gnu/packages/statistics.scm                        |    8 +-
 gnu/packages/stb.scm                               |   11 +
 gnu/packages/storage.scm                           |    4 +-
 gnu/packages/syncthing.scm                         |  311 +-
 gnu/packages/terminals.scm                         |    4 +-
 gnu/packages/text-editors.scm                      |   12 +-
 gnu/packages/tls.scm                               |    6 +-
 gnu/packages/tor.scm                               |    6 +-
 gnu/packages/version-control.scm                   |   46 +-
 gnu/packages/video.scm                             |    9 +-
 gnu/packages/vim.scm                               |   17 +-
 gnu/packages/web-browsers.scm                      |    4 +-
 gnu/packages/web.scm                               |  103 +-
 gnu/packages/webkit.scm                            |    8 +-
 gnu/packages/wine.scm                              |    7 +-
 gnu/packages/wm.scm                                |  208 +-
 gnu/packages/xdisorg.scm                           |   90 +-
 gnu/services/desktop.scm                           |    2 +-
 gnu/services/web.scm                               |    4 +
 gnu/tests/reconfigure.scm                          |    2 +-
 guix/build/go-build-system.scm                     |    5 +
 guix/git.scm                                       |   25 +-
 guix/import/gem.scm                                |  147 +-
 guix/import/pypi.scm                               |   34 +-
 guix/scripts/build.scm                             |   19 +
 guix/scripts/deploy.scm                            |    2 +-
 guix/scripts/describe.scm                          |   80 +-
 guix/scripts/pull.scm                              |   80 +-
 guix/scripts/system/reconfigure.scm                |    2 +-
 guix/swh.scm                                       |    4 +-
 guix/ui.scm                                        |    2 +-
 po/doc/guix-manual.de.po                           |    2 +-
 po/guix/fr.po                                      | 2980 ++++++++------
 po/guix/pt_BR.po                                   | 4192 ++++++++++++++------
 tests/gem.scm                                      |    4 +-
 tests/graph.scm                                    |    4 +-
 tests/guix-build.sh                                |    9 +
 tests/syscalls.scm                                 |   55 +-
 143 files changed, 11825 insertions(+), 4563 deletions(-)

diff --cc gnu/local.mk
index 60b1ce9,9a316f6..3477132
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -818,13 -815,9 +819,10 @@@ dist_patch_DATA =                                
                
    %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch    \
    %D%/packages/patches/doc++-include-directives.patch         \
    %D%/packages/patches/doc++-segfault-fix.patch                       \
-   %D%/packages/patches/docker-adjust-tests-for-changes-in-go.patch    \
-   %D%/packages/patches/docker-engine-test-noinstall.patch     \
    %D%/packages/patches/docker-fix-tests.patch                 \
-   %D%/packages/patches/docker-use-fewer-modprobes.patch               \
    %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch        \
    %D%/packages/patches/doxygen-test.patch                     \
 +  %D%/packages/patches/doxygen-1.8.17-runtests.patch          \
    %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch    \
    %D%/packages/patches/dstat-skip-devices-without-io.patch    \
    %D%/packages/patches/dvd+rw-tools-add-include.patch                 \
diff --cc gnu/packages/linux.scm
index b3f46c0,d1ce205..06ef1fa
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -2866,9 -2808,10 +2868,10 @@@ time."
       `(("pkg-config" ,pkg-config)
         ("procps" ,procps)))                       ;tests use 'pgrep'
      (inputs
-      `(("udev" ,eudev)))
+      `(("libaio" ,libaio)
+        ("udev" ,eudev)))
      (arguments
 -     '(#:phases
 +     `(#:phases
         (modify-phases %standard-phases
           (add-after 'configure 'set-makefile-shell
             (lambda _
@@@ -2895,20 -2838,7 +2898,12 @@@
                                                (assoc-ref %outputs "out")
                                                "/lib,-rpath="
                                                (assoc-ref %outputs "out")
 -                                              "/lib/device-mapper"))
 +                                              "/lib/device-mapper")
-                                ;; TODO: Patch make.tmpl.in to take LDFLAGS
-                                ;; into account so that we don't need to also
-                                ;; set CLDFLAGS.
-                                (string-append "CLDFLAGS=-Wl,-rpath="
-                                               (assoc-ref %outputs "out")
-                                               "/lib,-rpath="
-                                               (assoc-ref %outputs "out")
-                                               "/lib/device-mapper")
 +                               ;; This is needed when cross-compiling.
 +                               ,@(if (%current-target-system)
 +                                     '("ac_cv_func_malloc_0_nonnull=yes"
 +                                       "ac_cv_func_realloc_0_nonnull=yes")
 +                                     '()))
  
         ;; The tests use 'mknod', which requires root access.
         #:tests? #f))
diff --cc gnu/packages/perl.scm
index 590bd50,f513a78..078aa95
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@@ -22,8 -22,8 +22,9 @@@
  ;;; Copyright © 2018, 2019 Pierre Neidhardt <address@hidden>
  ;;; Copyright © 2018 Kei Kebreau <address@hidden>
  ;;; Copyright © 2019 Alex Griffin <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
  ;;; Copyright © 2019 Stephen J. Scheck <address@hidden>
+ ;;; Copyright © 2020 Vincent Legoll <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/pulseaudio.scm
index 62d555d,0c09b51..7c4c26f
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -9,7 -9,7 +9,8 @@@
  ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
  ;;; Copyright © 2018 Pierre Langlois <address@hidden>
  ;;; Copyright © 2019 Alex Griffin <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
+ ;;; Copyright © 2020 Amin Bandali <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/shells.scm
index f5e839f,2aac632..0e61284
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@@ -11,8 -11,8 +11,9 @@@
  ;;; Copyright © 2017 Arun Isaac <address@hidden>
  ;;; Copyright © 2019 Meiyo Peng <address@hidden>
  ;;; Copyright © 2019 Timothy Sample <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
- ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2020 Brice Waegeneire <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/web.scm
index cd83613,2b9836e..0b1a3a6
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@@ -34,11 -34,11 +34,13 @@@
  ;;; Copyright © 2019 Brendan Tildesley <address@hidden>
  ;;; Copyright © 2019 Alex Griffin <address@hidden>
  ;;; Copyright © 2019 Hartmut Goebel <address@hidden>
- ;;; Copyright © 2019 Jakob L. Kreuze <address@hidden>
+ ;;; Copyright © 2019 Jakob L. Kreuze <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
 +;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
  ;;; Copyright © 2019 Florian Pelz <address@hidden>
  ;;; Copyright © 2020 Timotej Lazar <address@hidden>
+ ;;; Copyright © 2020 Alexandros Theodotou <address@hidden>
+ ;;; Copyright © 2020 Pierre Neidhardt <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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