guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge remote-tracking branch 'master' into core-updates.


From: guix-commits
Subject: 01/01: Merge remote-tracking branch 'master' into core-updates.
Date: Tue, 31 Dec 2019 05:07:31 -0500 (EST)

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

commit ce9383c090fff90acb3a555d0ccfe12d791fef17
Merge: 91be09d fc4eb87
Author: Mathieu Othacehe <address@hidden>
Date:   Tue Dec 31 11:04:51 2019 +0100

    Merge remote-tracking branch 'master' into core-updates.

 .mailmap                                           |     2 +
 Makefile.am                                        |    30 +-
 build-aux/git-authenticate.scm                     |   413 +
 doc/contributing.texi                              |    49 +-
 doc/guix.texi                                      |   101 +-
 etc/news.scm                                       |    20 +
 gnu/bootloader/grub.scm                            |     8 +-
 gnu/build/linux-boot.scm                           |    18 +-
 gnu/build/vm.scm                                   |    10 +-
 gnu/installer/final.scm                            |     2 +-
 gnu/local.mk                                       |    29 +-
 gnu/packages/admin.scm                             |    46 +-
 gnu/packages/antivirus.scm                         |     4 +-
 gnu/packages/audio.scm                             |    81 +-
 .../aux-files/linux-libre/5.2-arm-veyron.conf      |  4944 ---------
 gnu/packages/aux-files/linux-libre/5.2-arm.conf    |  9115 -----------------
 gnu/packages/aux-files/linux-libre/5.2-arm64.conf  |  9073 -----------------
 gnu/packages/aux-files/linux-libre/5.2-i686.conf   | 10180 -------------------
 gnu/packages/aux-files/linux-libre/5.2-x86_64.conf | 10120 ------------------
 .../{5.3-arm-veyron.conf => 5.4-arm-veyron.conf}   |    87 +-
 .../linux-libre/{5.3-arm.conf => 5.4-arm.conf}     |   179 +-
 .../linux-libre/{5.3-arm64.conf => 5.4-arm64.conf} |   201 +-
 .../linux-libre/{5.3-i686.conf => 5.4-i686.conf}   |   220 +-
 .../{5.3-x86_64.conf => 5.4-x86_64.conf}           |   235 +-
 gnu/packages/axoloti.scm                           |   275 +-
 gnu/packages/bash.scm                              |     4 +-
 gnu/packages/benchmark.scm                         |    67 +-
 gnu/packages/bioconductor.scm                      |  2014 +++-
 gnu/packages/bioinformatics.scm                    |   539 +-
 gnu/packages/bittorrent.scm                        |     2 +-
 gnu/packages/bootloaders.scm                       |     2 +-
 gnu/packages/build-tools.scm                       |     2 +-
 gnu/packages/calendar.scm                          |     4 +-
 gnu/packages/cdrom.scm                             |     4 +-
 gnu/packages/check.scm                             |    34 +-
 gnu/packages/chez.scm                              |    27 +-
 gnu/packages/commencement.scm                      |    13 +
 gnu/packages/compression.scm                       |    30 +-
 gnu/packages/compton.scm                           |    54 +
 gnu/packages/connman.scm                           |     4 +-
 gnu/packages/coq.scm                               |    25 +
 gnu/packages/cpp.scm                               |     2 +-
 gnu/packages/cran.scm                              |  3176 +++++-
 gnu/packages/crypto.scm                            |     6 +-
 gnu/packages/cups.scm                              |     4 +-
 gnu/packages/databases.scm                         |    52 +-
 gnu/packages/diffoscope.scm                        |     7 +-
 gnu/packages/digest.scm                            |     9 +-
 gnu/packages/display-managers.scm                  |     2 +-
 gnu/packages/distributed.scm                       |     5 +-
 gnu/packages/dns.scm                               |    19 +-
 gnu/packages/drones.scm                            |   198 +
 gnu/packages/dunst.scm                             |    15 +-
 gnu/packages/ebook.scm                             |     6 +-
 gnu/packages/education.scm                         |    14 +-
 gnu/packages/emacs-xyz.scm                         |   673 +-
 gnu/packages/emacs.scm                             |   110 +-
 gnu/packages/embedded.scm                          |   126 +
 gnu/packages/emulators.scm                         |    18 +-
 gnu/packages/engineering.scm                       |    62 +-
 gnu/packages/file-systems.scm                      |   118 +-
 gnu/packages/finance.scm                           |    31 +-
 gnu/packages/freedesktop.scm                       |    13 +-
 gnu/packages/game-development.scm                  |    32 +
 gnu/packages/games.scm                             |    79 +-
 gnu/packages/gcc.scm                               |    35 +-
 gnu/packages/geo.scm                               |    94 +-
 gnu/packages/gnome-xyz.scm                         |   128 +-
 gnu/packages/gnome.scm                             |   382 +-
 gnu/packages/gnunet.scm                            |     7 +-
 gnu/packages/gnupg.scm                             |     4 +-
 gnu/packages/gnuzilla.scm                          |     7 +
 gnu/packages/graph.scm                             |     4 +-
 gnu/packages/guile-xyz.scm                         |   321 +-
 gnu/packages/guile.scm                             |    27 +-
 gnu/packages/haskell-apps.scm                      |     4 +-
 gnu/packages/haskell-xyz.scm                       |    23 +
 gnu/packages/image-viewers.scm                     |     6 +-
 gnu/packages/image.scm                             |     4 +-
 gnu/packages/imagemagick.scm                       |     5 +-
 gnu/packages/ipfs.scm                              |     5 +-
 gnu/packages/java-graphics.scm                     |   123 +
 gnu/packages/java.scm                              |    18 +-
 gnu/packages/kde-frameworks.scm                    |    51 +-
 gnu/packages/kde-multimedia.scm                    |   693 ++
 gnu/packages/kde-utils.scm                         |   527 +
 gnu/packages/kde.scm                               |    68 +-
 gnu/packages/lego.scm                              |    16 +-
 gnu/packages/libreoffice.scm                       |     8 +-
 gnu/packages/linux.scm                             |   101 +-
 gnu/packages/lisp-xyz.scm                          |     9 +-
 gnu/packages/lisp.scm                              |    64 +-
 gnu/packages/llvm.scm                              |     9 +-
 gnu/packages/lxde.scm                              |     6 +-
 gnu/packages/machine-learning.scm                  |    29 +
 gnu/packages/mail.scm                              |   159 +-
 gnu/packages/maths.scm                             |     7 +-
 gnu/packages/maven.scm                             |     2 +-
 gnu/packages/messaging.scm                         |     2 +-
 gnu/packages/mp3.scm                               |    49 +
 gnu/packages/mpd.scm                               |     8 +-
 gnu/packages/mpi.scm                               |    52 -
 gnu/packages/music.scm                             |    35 +-
 gnu/packages/nano.scm                              |     4 +-
 gnu/packages/networking.scm                        |    17 +-
 gnu/packages/parallel.scm                          |     4 +-
 gnu/packages/password-utils.scm                    |     1 +
 gnu/packages/patches/audiofile-CVE-2015-7747.patch |   156 +
 .../patches/audiofile-CVE-2018-13440.patch         |    28 +
 .../patches/audiofile-CVE-2018-17095.patch         |    26 +
 ...udiofile-Check-the-number-of-coefficients.patch |    30 +
 .../audiofile-Fail-on-error-in-parseFormat.patch   |    36 +
 .../audiofile-Fix-index-overflow-in-IMA.cpp.patch  |    33 +
 ...audiofile-Fix-multiply-overflow-sfconvert.patch |    66 +
 ...diofile-Fix-overflow-in-MSADPCM-decodeSam.patch |   116 +
 ...ofile-division-by-zero-BlockCodec-runPull.patch |    21 +
 .../patches/audiofile-fix-datatypes-in-tests.patch |    54 +
 .../patches/audiofile-fix-sign-conversion.patch    |    26 +
 gnu/packages/patches/audiofile-hurd.patch          |   381 +
 ...iofile-signature-of-multiplyCheckOverflow.patch |    35 +
 gnu/packages/patches/emacs27-exec-path.patch       |    18 +
 .../gcc-7-cross-environment-variables.patch        |    67 +
 .../patches/grantlee-merge-theme-dirs.patch        |   163 +
 gnu/packages/patches/hdf5-mpi-deprecations.patch   |    61 -
 gnu/packages/patches/kmplayer-aarch64.patch        |    57 +
 .../kmplayer-upstream_Fix-build-with-Qt-5.9.patch  |    42 +
 ...libgeotiff-adapt-test-script-for-proj-6.2.patch |    63 +
 .../libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch |    47 +
 .../patches/linux-libre-active-entropy.patch       |    86 -
 gnu/packages/patches/mumble-1.2.19-abs.patch       |    31 -
 gnu/packages/photo.scm                             |    20 +-
 gnu/packages/php.scm                               |     4 +-
 gnu/packages/python-crypto.scm                     |    16 +-
 gnu/packages/python-web.scm                        |     4 +-
 gnu/packages/python-xyz.scm                        |   475 +-
 gnu/packages/qt.scm                                |    13 +-
 gnu/packages/rails.scm                             |    13 +-
 gnu/packages/ruby.scm                              |   138 +-
 gnu/packages/samba.scm                             |    34 +-
 gnu/packages/scheme.scm                            |    12 +-
 gnu/packages/serialization.scm                     |     5 +-
 gnu/packages/shells.scm                            |    19 +-
 gnu/packages/sml.scm                               |     2 +-
 gnu/packages/sphinx.scm                            |    76 +-
 gnu/packages/ssh.scm                               |     4 +-
 gnu/packages/statistics.scm                        |    88 +-
 gnu/packages/tbb.scm                               |     7 +-
 gnu/packages/telephony.scm                         |   114 +-
 gnu/packages/terminals.scm                         |    10 +-
 gnu/packages/texinfo.scm                           |    59 +-
 gnu/packages/text-editors.scm                      |     4 +-
 gnu/packages/textutils.scm                         |    15 +-
 gnu/packages/tls.scm                               |     6 +-
 gnu/packages/toys.scm                              |    44 +
 gnu/packages/version-control.scm                   |    23 +-
 gnu/packages/video.scm                             |   135 +-
 gnu/packages/vim.scm                               |     4 +-
 gnu/packages/virtualization.scm                    |    47 +-
 gnu/packages/vpn.scm                               |     4 +-
 gnu/packages/web-browsers.scm                      |    23 +-
 gnu/packages/web.scm                               |    90 +-
 gnu/packages/wget.scm                              |     2 +-
 gnu/packages/wine.scm                              |    38 +-
 gnu/packages/wm.scm                                |    36 +-
 gnu/packages/xdisorg.scm                           |    31 +
 gnu/packages/xml.scm                               |     4 +-
 gnu/services/networking.scm                        |    11 +-
 gnu/services/web.scm                               |    57 +-
 gnu/system/vm.scm                                  |     5 +-
 gnu/tests.scm                                      |     2 +-
 guix/base64.scm                                    |    18 +-
 guix/build-system/linux-module.scm                 |     4 +-
 guix/build-system/qt.scm                           |   214 +-
 guix/build-system/r.scm                            |     2 +-
 guix/build/download.scm                            |    15 +-
 guix/build/emacs-build-system.scm                  |    14 +-
 guix/build/emacs-utils.scm                         |     8 +
 guix/describe.scm                                  |    18 +-
 guix/download.scm                                  |     1 -
 guix/gexp.scm                                      |     2 +-
 guix/git.scm                                       |    14 +-
 guix/gnupg.scm                                     |   150 +-
 guix/import/cran.scm                               |     5 +-
 guix/import/utils.scm                              |     2 +-
 guix/inferior.scm                                  |    14 +
 guix/packages.scm                                  |     4 +-
 guix/profiles.scm                                  |     6 +
 guix/progress.scm                                  |    31 +
 guix/repl.scm                                      |     2 +-
 guix/scripts/archive.scm                           |    45 +-
 guix/scripts/challenge.scm                         |   221 +-
 guix/scripts/pack.scm                              |    63 +-
 guix/scripts/package.scm                           |     7 +-
 guix/scripts/substitute.scm                        |    36 +-
 guix/scripts/system.scm                            |    14 +-
 guix/serialization.scm                             |   152 +-
 guix/swh.scm                                       |     4 +-
 guix/tests/http.scm                                |     6 +-
 guix/upstream.scm                                  |    24 +-
 tests/challenge.scm                                |    96 +-
 tests/gexp.scm                                     |     6 +
 tests/git.scm                                      |    26 +
 tests/guix-archive.sh                              |     7 +-
 tests/nar.scm                                      |    74 +
 tests/pack.scm                                     |     4 +-
 205 files changed, 14274 insertions(+), 46534 deletions(-)

diff --cc gnu/packages/gnupg.scm
index abce1aa,b31280e..4e8869a
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@@ -478,23 -465,9 +478,23 @@@ gpgpme starting with version 1.7."
                      (commit (string-append "v" version))))
                (sha256
                 (base32
-                 "1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z"))
+                 "0n232iyayc46f7hywmjw0jr7pbmmz5h4b04jskhkzz9gxz0ci99c"))
                (file-name (string-append name "-" version "-checkout"))))
      (build-system gnu-build-system)
 +    (arguments
 +     ;; When cross-compiling, the bash script libgcrypt-config provided by
 +     ;; libgcrypt must be accessible during configure phase.
 +     `(,@(if (%current-target-system)
 +             '(#:phases
 +               (modify-phases %standard-phases
 +                 (add-before 'configure 'add-libgrypt-config
 +                   (lambda _
 +                     (setenv "PATH" (string-append
 +                                     (assoc-ref %build-inputs "libgcrypt")
 +                                     "/bin:"
 +                                     (getenv "PATH")))
 +                     #t))))
 +             '())))
      (native-inputs
       `(("pkg-config" ,pkg-config)
         ("autoconf" ,autoconf)
diff --cc gnu/packages/shells.scm
index ef7f911,1d2f754..0369a20
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@@ -11,7 -11,7 +11,8 @@@
  ;;; 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>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/texinfo.scm
index c755790,44800b3..ae8ecc8
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@@ -2,9 -2,8 +2,10 @@@
  ;;; Copyright © 2012, 2013, 2015, 2016, 2017, 2019 Ludovic Courtès 
<address@hidden>
  ;;; Copyright © 2014, 2016 Eric Bavier <address@hidden>
  ;;; Copyright © 2015 Mark H Weaver <address@hidden>
- ;;; Copyright © 2017 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2017, 2019 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2019 Ricardo Wurmus <address@hidden>
 +;;; Copyright © 2019 Pierre-Moana Levesque <address@hidden>
 +;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
@@@ -22,16 -21,19 +23,21 @@@
  ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
  
  (define-module (gnu packages texinfo)
 +  #:use-module (gnu packages autotools)
    #:use-module (guix licenses)
    #:use-module (guix packages)
+   #:use-module (guix utils)
    #:use-module (guix download)
 +  #:use-module (guix utils)
+   #:use-module (guix git-download)
    #:use-module (guix build-system gnu)
    #:use-module (gnu packages)
+   #:use-module (gnu packages autotools)
    #:use-module (gnu packages compression)
+   #:use-module (gnu packages gettext)
    #:use-module (gnu packages ncurses)
-   #:use-module (gnu packages perl))
+   #:use-module (gnu packages perl)
+   #:use-module (gnu packages readline))
  
  (define-public texinfo
    (package



reply via email to

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