guix-commits
[Top][All Lists]
Advanced

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

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


From: guix-commits
Subject: 01/01: Merge branch 'staging' into core-updates
Date: Tue, 21 Jan 2020 17:07:21 -0500 (EST)

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

commit 8ed9be3faccb865204de46d2a8ed3e96e59281b6
Merge: 36930b2 715110a
Author: Marius Bakke <address@hidden>
AuthorDate: Tue Jan 21 22:39:42 2020 +0100

    Merge branch 'staging' into core-updates

 .mailmap                                           |    1 +
 build-aux/git-authenticate.scm                     |    3 +-
 configure.ac                                       |    2 +-
 doc/contributing.texi                              |    2 +-
 doc/guix-cookbook.texi                             |   10 +-
 doc/guix.texi                                      |  106 +-
 etc/guix-install.sh                                |   21 +
 gnu/installer/newt/page.scm                        |  109 +-
 gnu/local.mk                                       |   18 +-
 gnu/packages.scm                                   |    3 +
 gnu/packages/audio.scm                             |   76 +-
 gnu/packages/aux-files/linux-libre/4.14-arm.conf   |   12 +-
 gnu/packages/aux-files/linux-libre/4.14-i686.conf  |   12 +-
 .../aux-files/linux-libre/4.14-x86_64.conf         |   12 +-
 gnu/packages/aux-files/linux-libre/4.19-arm.conf   |   12 +-
 gnu/packages/aux-files/linux-libre/4.19-arm64.conf |   12 +-
 gnu/packages/aux-files/linux-libre/4.19-i686.conf  |   12 +-
 .../aux-files/linux-libre/4.19-x86_64.conf         |   12 +-
 gnu/packages/aux-files/linux-libre/4.4-i686.conf   |   12 +-
 gnu/packages/aux-files/linux-libre/4.4-x86_64.conf |   12 +-
 gnu/packages/aux-files/linux-libre/4.9-i686.conf   |   12 +-
 gnu/packages/aux-files/linux-libre/4.9-x86_64.conf |   12 +-
 .../aux-files/linux-libre/5.4-arm-veyron.conf      |   12 +-
 gnu/packages/aux-files/linux-libre/5.4-arm.conf    |   12 +-
 gnu/packages/aux-files/linux-libre/5.4-arm64.conf  |   12 +-
 gnu/packages/aux-files/linux-libre/5.4-i686.conf   |   12 +-
 gnu/packages/aux-files/linux-libre/5.4-x86_64.conf |   12 +-
 gnu/packages/avahi.scm                             |    2 +-
 gnu/packages/bioconductor.scm                      |   54 +-
 gnu/packages/bioinformatics.scm                    |  115 +-
 gnu/packages/calendar.scm                          |    4 +-
 gnu/packages/certs.scm                             |    4 +-
 gnu/packages/check.scm                             |   29 +-
 gnu/packages/chromium.scm                          |   42 +-
 gnu/packages/ci.scm                                |    6 +-
 gnu/packages/code.scm                              |    4 +-
 gnu/packages/compression.scm                       |    4 +-
 gnu/packages/cran.scm                              |  178 +-
 gnu/packages/crates-io.scm                         | 2590 ++++++++++++++++----
 gnu/packages/crypto.scm                            |    1 -
 gnu/packages/cups.scm                              |    8 +-
 gnu/packages/databases.scm                         |   61 +-
 gnu/packages/dejagnu.scm                           |    4 +-
 gnu/packages/dictionaries.scm                      |    5 +-
 gnu/packages/diffoscope.scm                        |    4 +-
 gnu/packages/django.scm                            |    3 +-
 gnu/packages/dns.scm                               |    6 +-
 gnu/packages/docbook.scm                           |   14 +-
 gnu/packages/drones.scm                            |    1 +
 gnu/packages/easyrpg.scm                           |   10 +-
 gnu/packages/emacs-xyz.scm                         |   43 +-
 gnu/packages/emacs.scm                             |    2 +-
 gnu/packages/embedded.scm                          |    2 +-
 gnu/packages/emulators.scm                         |   11 +-
 gnu/packages/finance.scm                           |   99 +
 gnu/packages/fonts.scm                             |    2 +-
 gnu/packages/fpga.scm                              |    2 +-
 gnu/packages/freedesktop.scm                       |    4 +-
 gnu/packages/game-development.scm                  |   84 +-
 gnu/packages/games.scm                             |  517 ++--
 gnu/packages/genealogy.scm                         |    6 +-
 gnu/packages/geo.scm                               |    4 +-
 gnu/packages/gl.scm                                |   19 +-
 gnu/packages/gnome.scm                             |  217 +-
 gnu/packages/gnucash.scm                           |    7 +-
 gnu/packages/gnuzilla.scm                          |   79 +-
 gnu/packages/graph.scm                             |    2 +-
 gnu/packages/graphics.scm                          |    6 +-
 gnu/packages/graphviz.scm                          |   22 +-
 gnu/packages/gstreamer.scm                         |  107 +-
 gnu/packages/guile-xyz.scm                         |  158 +-
 gnu/packages/guile.scm                             |   49 +-
 gnu/packages/hardware.scm                          |    4 +-
 gnu/packages/haskell-xyz.scm                       |    8 +-
 gnu/packages/image-viewers.scm                     |   94 +-
 gnu/packages/image.scm                             |   10 +-
 gnu/packages/imagemagick.scm                       |    4 +-
 gnu/packages/java.scm                              |    9 +-
 gnu/packages/lean.scm                              |    2 +-
 gnu/packages/libreoffice.scm                       |    1 -
 gnu/packages/libusb.scm                            |   20 +-
 gnu/packages/linux.scm                             |   44 +-
 gnu/packages/lisp-xyz.scm                          |  517 +++-
 gnu/packages/lisp.scm                              |  103 +-
 gnu/packages/mail.scm                              |   27 +-
 gnu/packages/maths.scm                             |   20 +-
 gnu/packages/mpd.scm                               |    8 +-
 gnu/packages/networking.scm                        |    4 +-
 gnu/packages/nim.scm                               |   10 +-
 gnu/packages/node-xyz.scm                          |  246 ++
 gnu/packages/noweb.scm                             |   50 +-
 gnu/packages/nss.scm                               |    6 +-
 gnu/packages/nutrition.scm                         |    3 +-
 gnu/packages/ocaml.scm                             |  151 +-
 gnu/packages/openstack.scm                         |    1 +
 gnu/packages/package-management.scm                |   21 +-
 gnu/packages/password-utils.scm                    |    5 +-
 .../patches/gzdoom-find-system-libgme.patch        |   21 +
 ...8.0-fix-variable-length-integer-receiving.patch |   15 -
 .../patches/python-packaging-test-arch.patch       |   65 +
 .../python2-parameterized-docstring-test.patch     |   18 +
 .../red-eclipse-remove-gamma-name-hack.patch       |   52 -
 .../supercollider-boost-1.70-build-fix.patch       |   28 -
 .../patches/teeworlds-use-latest-wavpack.patch     |  126 -
 .../patches/usb-modeswitch-accept-config-arg.patch |   42 -
 gnu/packages/patches/xmoto-remove-glext.patch      |   23 +
 gnu/packages/patches/xmoto-reproducible.patch      |   24 +
 gnu/packages/patches/xmoto-utf8.patch              |   16 +
 gnu/packages/perl.scm                              |   36 +
 gnu/packages/plotutils.scm                         |   21 +-
 gnu/packages/popt.scm                              |   15 +-
 gnu/packages/pretty-print.scm                      |    4 +-
 gnu/packages/pulseaudio.scm                        |    1 +
 gnu/packages/python-check.scm                      |    3 +-
 gnu/packages/python-compression.scm                |   23 +-
 gnu/packages/python-science.scm                    |    1 +
 gnu/packages/python-web.scm                        |   32 +-
 gnu/packages/python-xyz.scm                        |  390 ++-
 gnu/packages/qt.scm                                |  107 +-
 gnu/packages/rcm.scm                               |   62 +
 gnu/packages/regex.scm                             |    4 +-
 gnu/packages/ruby.scm                              |    4 +-
 gnu/packages/rust-apps.scm                         |   93 +-
 gnu/packages/rust.scm                              |   73 +-
 gnu/packages/sagemath.scm                          |   14 +-
 gnu/packages/samba.scm                             |    4 +-
 gnu/packages/scheme.scm                            |   19 +-
 gnu/packages/sdr.scm                               |   58 +
 gnu/packages/shells.scm                            |    2 +-
 gnu/packages/ssh.scm                               |    9 +-
 gnu/packages/statistics.scm                        |   83 +-
 gnu/packages/synergy.scm                           |   15 +-
 gnu/packages/telephony.scm                         |   18 +-
 gnu/packages/text-editors.scm                      |  106 +-
 gnu/packages/textutils.scm                         |    2 +-
 gnu/packages/tls.scm                               |    4 +-
 gnu/packages/tryton.scm                            |    1 +
 gnu/packages/uml.scm                               |    2 +-
 gnu/packages/upnp.scm                              |    6 +-
 gnu/packages/usb-modeswitch.scm                    |   31 +-
 gnu/packages/version-control.scm                   |  140 +-
 gnu/packages/video.scm                             |   44 +-
 gnu/packages/vpn.scm                               |    2 +-
 gnu/packages/web-browsers.scm                      |   45 +-
 gnu/packages/web.scm                               |   69 +-
 gnu/packages/wireservice.scm                       |    3 +-
 gnu/packages/wm.scm                                |    5 +-
 gnu/packages/xdisorg.scm                           |   10 +-
 gnu/packages/xml.scm                               |   95 +-
 gnu/packages/xorg.scm                              |   12 +-
 gnu/services/avahi.scm                             |    2 +-
 gnu/services/databases.scm                         |    6 +-
 gnu/services/desktop.scm                           |   29 +-
 gnu/services/getmail.scm                           |   21 +-
 gnu/tests/install.scm                              |   14 +-
 gnu/tests/mail.scm                                 |    2 -
 guix/build/clojure-utils.scm                       |   15 +-
 guix/build/syscalls.scm                            |    4 +-
 guix/import/cpan.scm                               |  161 +-
 guix/import/cran.scm                               |    9 +-
 guix/import/crate.scm                              |    3 +-
 guix/import/elpa.scm                               |    5 +-
 guix/import/opam.scm                               |   21 +-
 guix/import/texlive.scm                            |    5 +-
 guix/inferior.scm                                  |    5 +-
 guix/lint.scm                                      |   24 +-
 guix/lzlib.scm                                     |   42 +-
 guix/records.scm                                   |   19 +-
 guix/scripts/challenge.scm                         |    7 +-
 guix/scripts/edit.scm                              |   10 +-
 guix/scripts/graph.scm                             |    8 +
 guix/scripts/package.scm                           |   21 +-
 guix/scripts/publish.scm                           |    4 +-
 guix/scripts/refresh.scm                           |   18 +
 guix/scripts/repl.scm                              |   39 +-
 guix/scripts/size.scm                              |    8 +
 guix/scripts/substitute.scm                        |    2 +-
 guix/serialization.scm                             |    3 +-
 guix/ui.scm                                        |   15 +-
 tests/cpan.scm                                     |  114 +-
 tests/cran.scm                                     |    6 +-
 tests/crate.scm                                    |    5 +-
 tests/elpa.scm                                     |  101 +-
 tests/guix-graph.sh                                |   27 +-
 tests/guix-system.sh                               |   29 +-
 tests/lint.scm                                     |   18 +-
 tests/lzlib.scm                                    |    3 +-
 tests/opam.scm                                     |   67 +-
 tests/packages.scm                                 |   11 +-
 tests/publish.scm                                  |    8 +-
 tests/records.scm                                  |   34 +-
 tests/texlive.scm                                  |   14 +-
 192 files changed, 7075 insertions(+), 2484 deletions(-)

diff --cc gnu/local.mk
index 659098d,448e70a..b6a7178
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1403,12 -1406,12 +1406,11 @@@ dist_patch_DATA =                            
                
    %D%/packages/patches/tar-skip-unreliable-tests.patch                \
    %D%/packages/patches/tcc-boot-0.9.27.patch                  \
    %D%/packages/patches/tclxml-3.2-install.patch                       \
 +  %D%/packages/patches/tcl-fix-cross-compilation.patch                \
    %D%/packages/patches/tcsh-fix-autotest.patch                        \
 -  %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch      \
    %D%/packages/patches/teensy-loader-cli-help.patch           \
-   %D%/packages/patches/teeworlds-use-latest-wavpack.patch     \
    %D%/packages/patches/texinfo-5-perl-compat.patch            \
 -  %D%/packages/patches/texlive-bin-CVE-2018-17407.patch               \
 -  %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch        \
 +  %D%/packages/patches/texlive-bin-poppler-0.83.patch         \
    %D%/packages/patches/telegram-purple-adjust-test.patch      \
    %D%/packages/patches/texi2html-document-encoding.patch      \
    %D%/packages/patches/texi2html-i18n.patch                   \
diff --cc gnu/packages/avahi.scm
index f82a421,ba609cf..8a01272
--- a/gnu/packages/avahi.scm
+++ b/gnu/packages/avahi.scm
@@@ -35,7 -35,8 +35,7 @@@
    (package
      (name "avahi")
      (version "0.7")
-     (home-page "http://avahi.org";)
 -    (replacement avahi/fixed)
+     (home-page "https://avahi.org";)
      (source (origin
               (method url-fetch)
               (uri (string-append home-page "/download/avahi-"
diff --cc gnu/packages/linux.scm
index e91d4c2,4f8400b..3fd7030
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -1256,10 -1231,10 +1256,10 @@@ by Robert Shea and Robert Anton Wilson.
                                    "procps-ng-" version ".tar.xz"))
                (sha256
                 (base32
-                 "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h"))))
+                 "1br0g93ysqhlv13i1k4lfbimsgxnpy5rgs4lxfc9rkzdbpbaqplj"))))
      (build-system gnu-build-system)
      (arguments
 -     '(#:modules ((guix build utils)
 +     `(#:modules ((guix build utils)
                    (guix build gnu-build-system)
                    (srfi srfi-1)
                    (srfi srfi-26))
@@@ -1356,9 -1325,9 +1356,9 @@@ slabtop, and skill."
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "00nwl1ppjalxbnx40dsm895r3q793p8nni6n81saj7faj2szdyk5"))))
+                "1pmf8inp736l587rqq7qsd8bv0mmg5cwrivxg5p5awqgv70crypr"))))
      (build-system gnu-build-system)
 -    (inputs `(("util-linux" ,util-linux)))
 +    (inputs `(("util-linux" ,util-linux "lib")))
      (native-inputs `(("pkg-config" ,pkg-config)
                       ("texinfo" ,texinfo)       ;for the libext2fs Info manual
  



reply via email to

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