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: Marius Bakke
Subject: 01/01: Merge branch 'staging' into core-updates
Date: Sat, 25 Aug 2018 10:54:26 -0400 (EDT)

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

commit 839167ff9d74fc490b32f6a197591964f73b65e5
Merge: 27c1df0 030c912
Author: Marius Bakke <address@hidden>
Date:   Sat Aug 25 16:44:07 2018 +0200

    Merge branch 'staging' into core-updates

 Makefile.am                                        |    10 +-
 doc/guix.fr.texi                                   |  4270 +-
 doc/guix.texi                                      |    74 +-
 gnu/build/linux-modules.scm                        |    10 +-
 gnu/local.mk                                       |    21 +-
 gnu/packages/admin.scm                             |   162 +-
 gnu/packages/algebra.scm                           |    61 +-
 gnu/packages/astronomy.scm                         |     7 +-
 gnu/packages/audio.scm                             |    59 +-
 gnu/packages/authentication.scm                    |    77 +
 .../linux-libre/{4.17-arm.conf => 4.18-arm.conf}   |   252 +-
 .../{4.17-arm64.conf => 4.18-arm64.conf}           |   270 +-
 .../linux-libre/{4.17-i686.conf => 4.18-i686.conf} |   271 +-
 .../{4.17-x86_64.conf => 4.18-x86_64.conf}         |   284 +-
 gnu/packages/backup.scm                            |    53 +-
 gnu/packages/bioconductor.scm                      |    37 +
 gnu/packages/bioinformatics.scm                    |   157 +-
 gnu/packages/bittorrent.scm                        |    58 +-
 gnu/packages/boost.scm                             |    16 +
 gnu/packages/bootloaders.scm                       |     8 +-
 gnu/packages/calendar.scm                          |     4 +-
 gnu/packages/cdrom.scm                             |    10 +-
 gnu/packages/ci.scm                                |     6 +-
 gnu/packages/code.scm                              |     8 +-
 gnu/packages/compression.scm                       |    26 +-
 gnu/packages/cpp.scm                               |    15 +-
 gnu/packages/cran.scm                              |   365 +-
 gnu/packages/crypto.scm                            |    14 +-
 gnu/packages/databases.scm                         |   170 +-
 gnu/packages/dictionaries.scm                      |     9 +-
 gnu/packages/disk.scm                              |    33 +-
 gnu/packages/django.scm                            |     4 +-
 gnu/packages/dns.scm                               |    43 +-
 gnu/packages/elixir.scm                            |     2 +-
 gnu/packages/emacs.scm                             |    30 +-
 gnu/packages/emulators.scm                         |    15 +-
 gnu/packages/engineering.scm                       |    16 +-
 gnu/packages/erlang.scm                            |    16 +-
 gnu/packages/fonts.scm                             |     9 +-
 gnu/packages/fontutils.scm                         |    27 +-
 gnu/packages/freedesktop.scm                       |    18 +-
 gnu/packages/game-development.scm                  |     4 +-
 gnu/packages/games.scm                             |    64 +-
 gnu/packages/gcc.scm                               |     1 +
 gnu/packages/gd.scm                                |     4 +-
 gnu/packages/gdb.scm                               |     4 +-
 gnu/packages/gettext.scm                           |    54 +-
 gnu/packages/gimp.scm                              |    23 +-
 gnu/packages/gl.scm                                |     2 +-
 gnu/packages/glib.scm                              |    10 +-
 gnu/packages/gnome.scm                             |    31 +-
 gnu/packages/gnupg.scm                             |    36 +-
 gnu/packages/gstreamer.scm                         |    10 +-
 gnu/packages/gtk.scm                               |    18 +-
 gnu/packages/guile.scm                             |    61 +-
 gnu/packages/haskell-check.scm                     |    89 +-
 gnu/packages/haskell-web.scm                       |   109 +-
 gnu/packages/haskell.scm                           |   472 +-
 gnu/packages/image.scm                             |     7 +-
 gnu/packages/imagemagick.scm                       |    10 +-
 gnu/packages/language.scm                          |    40 +-
 gnu/packages/libevent.scm                          |     9 +-
 gnu/packages/libusb.scm                            |    10 +-
 gnu/packages/license.scm                           |    19 +-
 gnu/packages/lighting.scm                          |     4 +-
 gnu/packages/linux.scm                             |   131 +-
 gnu/packages/mail.scm                              |    48 +-
 gnu/packages/markup.scm                            |     9 +-
 gnu/packages/marst.scm                             |     2 +-
 gnu/packages/maths.scm                             |    37 +-
 gnu/packages/mes.scm                               |    21 +-
 gnu/packages/messaging.scm                         |     4 +-
 gnu/packages/mp3.scm                               |     4 +-
 gnu/packages/mpd.scm                               |    16 +-
 gnu/packages/music.scm                             |   107 +-
 gnu/packages/ncurses.scm                           |     8 +-
 gnu/packages/networking.scm                        |   225 +-
 gnu/packages/ntp.scm                               |     4 +-
 gnu/packages/openldap.scm                          |   200 +-
 gnu/packages/parallel.scm                          |     4 +-
 gnu/packages/password-utils.scm                    |   131 +-
 .../patches/aegisub-icu59-include-unistr.patch     |    12 +
 .../patches/btrfs-progs-e-value-block.patch        |    37 -
 gnu/packages/patches/byobu-writable-status.patch   |    10 +-
 gnu/packages/patches/clementine-fix-sqlite.patch   |    23 +
 gnu/packages/patches/eigen-arm-neon-fixes.patch    |   245 -
 .../patches/extundelete-e2fsprogs-1.44.patch       |    23 +
 .../patches/gcc-4.8-libsanitizer-fix.patch         |    15 +
 gnu/packages/patches/gdm-CVE-2018-14424.patch      |   172 +
 gnu/packages/patches/lxc-CVE-2018-6556.patch       |   116 -
 .../patches/openssl-1.1.0-CVE-2018-0495.patch      |   152 -
 .../patches/openssl-1.1.0-CVE-2018-0732.patch      |    50 -
 .../patches/perl-dbd-mysql-CVE-2017-10788.patch    |    62 -
 gnu/packages/patches/qemu-CVE-2018-11806.patch     |   105 -
 gnu/packages/patches/qtoctave-qt-5.11-fix.patch    |    26 -
 gnu/packages/patches/racket-fix-xform-issue.patch  |    63 -
 .../patches/racket-store-checksum-override.patch   |    49 +
 .../patches/soundtouch-CVE-2018-1000223.patch      |   143 +
 .../patches/soundtouch-CVE-2018-14044-14045.patch  |   138 +
 .../patches/translate-shell-fix-curl-tests.patch   |    60 -
 gnu/packages/pdf.scm                               |     8 +-
 gnu/packages/perl-check.scm                        |   107 +-
 gnu/packages/perl.scm                              |   779 +-
 gnu/packages/photo.scm                             |     2 +-
 gnu/packages/plotutils.scm                         |    16 +-
 gnu/packages/profiling.scm                         |    17 +-
 gnu/packages/protobuf.scm                          |     4 +-
 gnu/packages/python-crypto.scm                     |     4 +-
 gnu/packages/python-web.scm                        |    32 +-
 gnu/packages/python.scm                            |    90 +-
 gnu/packages/rdf.scm                               |     4 +-
 gnu/packages/samba.scm                             |     4 +-
 gnu/packages/scheme.scm                            |    44 +-
 gnu/packages/screen.scm                            |    12 +-
 gnu/packages/security-token.scm                    |    28 +-
 gnu/packages/shells.scm                            |     4 +-
 gnu/packages/skarnet.scm                           |    58 +-
 gnu/packages/spice.scm                             |     8 +-
 gnu/packages/ssh.scm                               |    13 +-
 gnu/packages/statistics.scm                        |    92 +-
 gnu/packages/syncthing.scm                         |     4 +-
 gnu/packages/tcl.scm                               |     2 +-
 gnu/packages/tex.scm                               |   125 +-
 gnu/packages/tls.scm                               |    24 +-
 gnu/packages/toys.scm                              |    15 +-
 gnu/packages/version-control.scm                   |    51 +-
 gnu/packages/video.scm                             |    26 +-
 gnu/packages/virtualization.scm                    |    10 +-
 gnu/packages/web-browsers.scm                      |     4 +-
 gnu/packages/web.scm                               |   320 +-
 gnu/packages/webkit.scm                            |     4 +-
 gnu/packages/wine.scm                              |    52 +-
 gnu/packages/wm.scm                                |    11 +-
 gnu/packages/xdisorg.scm                           |    16 +-
 gnu/packages/xfig.scm                              |     4 +-
 gnu/packages/xml.scm                               |    66 +-
 gnu/packages/xorg.scm                              |    26 +-
 gnu/services/cgit.scm                              |    13 +-
 gnu/services/cuirass.scm                           |     4 +-
 gnu/services/databases.scm                         |     9 +-
 gnu/services/messaging.scm                         |     9 +-
 gnu/services/security-token.scm                    |    93 +
 gnu/services/web.scm                               |    11 +-
 gnu/tests/security-token.scm                       |    71 +
 guix/build-system/asdf.scm                         |     2 +-
 guix/build/debug-link.scm                          |   210 +
 guix/build/graft.scm                               |    31 +-
 guix/build/svn.scm                                 |     2 +-
 guix/grafts.scm                                    |    17 +-
 guix/import/cpan.scm                               |     4 +-
 guix/import/github.scm                             |    92 +-
 guix/import/hackage.scm                            |   124 +-
 guix/import/json.scm                               |    14 +-
 guix/inferior.scm                                  |     5 +-
 guix/scripts/import/hackage.scm                    |    37 +-
 po/doc/guix-manual.fr.po                           |  2077 +-
 po/guix/da.po                                      |   774 +-
 po/guix/de.po                                      |  2927 +-
 po/guix/fr.po                                      | 42598 +++++++++++++++++--
 tests/cpan.scm                                     |     2 +-
 tests/debug-link.scm                               |   158 +
 tests/gremlin.scm                                  |     4 +-
 162 files changed, 51498 insertions(+), 10416 deletions(-)

diff --cc gnu/local.mk
index e98973b,60db25a..aac3a66
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -641,9 -646,9 +645,8 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/doc++-include-directives.patch         \
    %D%/packages/patches/doc++-segfault-fix.patch                       \
    %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch        \
 -  %D%/packages/patches/doxygen-gcc-ice.patch                  \
    %D%/packages/patches/doxygen-test.patch                     \
    %D%/packages/patches/dvd+rw-tools-add-include.patch                 \
-   %D%/packages/patches/eigen-arm-neon-fixes.patch             \
    %D%/packages/patches/elfutils-tests-ptrace.patch            \
    %D%/packages/patches/elogind-glibc-2.27.patch                       \
    %D%/packages/patches/einstein-build.patch                   \
@@@ -690,9 -695,9 +694,10 @@@
    %D%/packages/patches/gcc-asan-missing-include.patch         \
    %D%/packages/patches/gcc-cross-environment-variables.patch  \
    %D%/packages/patches/gcc-fix-texi2pod.patch                 \
+   %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch         \
    %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch         \
    %D%/packages/patches/gcc-libsanitizer-fix.patch             \
 +  %D%/packages/patches/gcc-libsanitizer-ustat.patch           \
    %D%/packages/patches/gcc-libvtv-runpath.patch                       \
    %D%/packages/patches/gcc-strmov-store-file-names.patch      \
    %D%/packages/patches/gcc-4-compile-with-gcc-5.patch          \
@@@ -711,7 -716,7 +716,8 @@@
    %D%/packages/patches/gd-CVE-2018-5711.patch                 \
    %D%/packages/patches/gd-fix-tests-on-i686.patch             \
    %D%/packages/patches/gd-freetype-test-failure.patch         \
 +  %D%/packages/patches/gdb-python-3.7.patch                   \
+   %D%/packages/patches/gdm-CVE-2018-14424.patch                       \
    %D%/packages/patches/gemma-intel-compat.patch                       \
    %D%/packages/patches/geoclue-config.patch                   \
    %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
@@@ -1011,8 -1013,10 +1014,7 @@@
    %D%/packages/patches/patchelf-rework-for-arm.patch          \
    %D%/packages/patches/patchutils-xfail-gendiff-tests.patch   \
    %D%/packages/patches/patch-hurd-path-max.patch              \
 -  %D%/packages/patches/perf-gcc-ice.patch                     \
 -  %D%/packages/patches/perl-archive-tar-CVE-2018-12015.patch  \
 -  %D%/packages/patches/perl-file-path-CVE-2017-6512.patch     \
    %D%/packages/patches/perl-autosplit-default-time.patch      \
-   %D%/packages/patches/perl-dbd-mysql-CVE-2017-10788.patch    \
    %D%/packages/patches/perl-deterministic-ordering.patch      \
    %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
    %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
diff --cc gnu/packages/fontutils.scm
index f9e117b,30143eb..69e35cd
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -6,8 -6,7 +6,8 @@@
  ;;; Copyright © 2017 Rene Saavedra <address@hidden>
  ;;; Copyright © 2017 Leo Famulari <address@hidden>
  ;;; Copyright © 2017 Nils Gillmann <address@hidden>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
 +;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;
diff --cc gnu/packages/gdb.scm
index 4c47cc5,f0c4c8b..d7b1946
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@@ -42,10 -42,9 +42,10 @@@
               (method url-fetch)
               (uri (string-append "mirror://gnu/gdb/gdb-"
                                   version ".tar.xz"))
 +             (patches (search-patches "gdb-python-3.7.patch"))
               (sha256
                (base32
-                "0d2bpqk58fqlx21rbnk8mbcjlggzc9kb5sjirrfrrrjq70ka0qdg"))))
+                "0g6hv9xk12aa58w77fydaldqr9a6b0a6bnwsq87jfc6lkcbc7p4p"))))
      (build-system gnu-build-system)
      (arguments
       `(#:tests? #f ; FIXME "make check" fails on single-processor systems.
diff --cc gnu/packages/python.scm
index 8c5e089,3c46102..244faa2
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -2740,12 -2845,26 +2740,30 @@@ and is very extensible."
           (add-before 'check 'set-HOME
             ;; some tests require access to "$HOME/.cython"
             (lambda _ (setenv "HOME" "/tmp") #t))
+ 
+          ;; FIXME: These tests started failing on armhf after the 0.28 update
+          ;; (commit c69d11c5930), both with an error such as this:
+          ;;  compiling (cpp) and running dictcomp ...
+          ;;  === C/C++ compiler error output: ===
+          ;;  ‘
+          ;;  dictcomp.cpp:5221: confused by earlier errors, bailing out
+          ;; See <https://hydra.gnu.org/build/2948724> for logs.
+          ,@(if (target-arm32?)
+                `((add-before 'check 'disable-failing-tests
+                   (lambda _
+                     (let ((disabled-tests (open-file "tests/bugs.txt" "a")))
+                       (for-each (lambda (test)
+                                   (format disabled-tests "~a\n" test))
+                                 '("memslice" "dictcomp"))
+                       (close-port disabled-tests)))))
+                '())
+ 
           (replace 'check
 -           (lambda _ (invoke "python" "runtests.py" "-vv"))))))
 +           (lambda _
 +             ;; The "with_outer_raising" test fails with Python 3.7.  See
 +             ;; https://github.com/cython/cython/issues/2454
 +             (delete-file "tests/run/generators_py.py")
 +             (invoke "python" "runtests.py" "-vv"))))))
      (home-page "http://cython.org/";)
      (synopsis "C extensions for Python")
      (description "Cython is an optimising static compiler for both the Python
diff --cc gnu/packages/tex.scm
index 98fc9f0,6ab999b..ed85950
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -6,10 -6,10 +6,10 @@@
  ;;; Copyright © 2016, 2018 Efraim Flashner <address@hidden>
  ;;; Copyright © 2016 Federico Beffa <address@hidden>
  ;;; Copyright © 2016 Thomas Danckaert <address@hidden>
 -;;; Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
 +;;; Copyright © 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2017 Leo Famulari <address@hidden>
  ;;; Copyright © 2017 Marius Bakke <address@hidden>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
  ;;; Copyright © 2018 Danny Milosavljevic <address@hidden>
  ;;; Copyright © 2018 Arun Isaac <address@hidden>
  ;;;



reply via email to

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