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: Thu, 31 Jan 2019 18:03:32 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit 0747328e317de4bf936fab50e795d1e1523adfc1
Merge: df09e1d ff75441
Author: Marius Bakke <address@hidden>
Date:   Thu Jan 31 23:32:56 2019 +0100

    Merge branch 'master' into staging

 doc/guix.texi                                      |   187 +-
 gnu/build/linux-modules.scm                        |    28 +
 gnu/installer.scm                                  |     1 +
 gnu/local.mk                                       |    22 +-
 gnu/packages/admin.scm                             |     4 +-
 gnu/packages/audio.scm                             |    12 +-
 gnu/packages/backup.scm                            |     4 +-
 gnu/packages/bioinformatics.scm                    |    28 +-
 gnu/packages/bootloaders.scm                       |     2 +-
 gnu/packages/c.scm                                 |    14 +-
 gnu/packages/check.scm                             |    16 +-
 gnu/packages/ci.scm                                |     1 +
 gnu/packages/clojure.scm                           |    19 +-
 gnu/packages/compression.scm                       |    35 +-
 gnu/packages/cpp.scm                               |    15 +-
 gnu/packages/cran.scm                              |    95 +-
 gnu/packages/crypto.scm                            |    28 +-
 gnu/packages/databases.scm                         |     3 +-
 gnu/packages/datastructures.scm                    |    15 +-
 gnu/packages/debug.scm                             |    21 +-
 gnu/packages/dictionaries.scm                      |     6 +-
 gnu/packages/django.scm                            |     2 +-
 gnu/packages/emacs-xyz.scm                         |     6 +-
 gnu/packages/emulators.scm                         |    21 +-
 gnu/packages/engineering.scm                       |    19 +-
 gnu/packages/games.scm                             |   243 +-
 gnu/packages/gnuzilla.scm                          |   225 +-
 gnu/packages/golang.scm                            |    16 +-
 gnu/packages/gtk.scm                               |     1 +
 gnu/packages/{guile.scm => guile-xyz.scm}          |  3256 ++-
 gnu/packages/guile.scm                             |  1817 +-
 gnu/packages/image-processing.scm                  |     8 +-
 gnu/packages/image.scm                             |     4 +-
 gnu/packages/java.scm                              |   225 +
 gnu/packages/kde-frameworks.scm                    |    27 +-
 gnu/packages/kde.scm                               |     6 +-
 gnu/packages/linux.scm                             |    20 +-
 gnu/packages/llvm.scm                              |     5 +-
 gnu/packages/mail.scm                              |    16 +-
 gnu/packages/man.scm                               |     6 +-
 gnu/packages/maths.scm                             |   237 +-
 gnu/packages/mpi.scm                               |     8 +-
 gnu/packages/music.scm                             |    65 +-
 gnu/packages/networking.scm                        |     4 +-
 gnu/packages/package-management.scm                |    10 +-
 gnu/packages/patches/combinatorial-blas-awpm.patch |    67 +
 .../patches/combinatorial-blas-io-fix.patch        |    14 +
 .../patches/icecat-avoid-bundled-libraries.patch   |    16 +-
 gnu/packages/patches/icecat-makeicecat.patch       |   154 +
 .../icecat-use-system-graphite2+harfbuzz.patch     |    50 +-
 .../patches/icecat-use-system-media-libs.patch     |    87 +-
 ...-mark-more-tests-that-require-the-network.patch |   182 +
 gnu/packages/patches/p11-kit-jks-timestamps.patch  |    42 +
 gnu/packages/patches/qemu-CVE-2018-16872.patch     |    88 +
 gnu/packages/patches/qemu-CVE-2019-6778.patch      |    43 +
 gnu/packages/patches/scotch-graph-diam-64.patch    |    27 -
 .../patches/scotch-graph-induce-type-64.patch      |    19 -
 .../patches/scotch-integer-declarations.patch      |    37 +
 gnu/packages/patches/scotch-test-threading.patch   |    22 -
 gnu/packages/patches/superlu-dist-awpm-grid.patch  |    36 +
 .../patches/x265-detect512-all-arches.patch        |    37 -
 gnu/packages/python-crypto.scm                     |    28 +-
 gnu/packages/python-web.scm                        |   105 +-
 gnu/packages/python-xyz.scm                        |   139 +-
 gnu/packages/qt.scm                                |    13 +-
 gnu/packages/sagemath.scm                          |    60 +
 gnu/packages/scheme.scm                            |     7 +-
 gnu/packages/shells.scm                            |   180 +-
 gnu/packages/skribilo.scm                          |     1 +
 gnu/packages/statistics.scm                        |    47 +-
 gnu/packages/terminals.scm                         |    17 +-
 gnu/packages/tex.scm                               |    78 +-
 gnu/packages/tls.scm                               |     5 +-
 gnu/packages/video.scm                             |    39 +-
 gnu/packages/virtualization.scm                    |    12 +-
 gnu/packages/web.scm                               |    59 +-
 gnu/packages/wm.scm                                |     4 +-
 gnu/packages/xorg.scm                              |    55 +
 gnu/services/mcron.scm                             |     2 +-
 gnu/services/xorg.scm                              |     6 +-
 guix/channels.scm                                  |    11 +-
 guix/packages.scm                                  |    16 +-
 guix/scripts/pull.scm                              |    10 +-
 guix/self.scm                                      |    18 +-
 guix/status.scm                                    |   157 +-
 po/doc/guix-manual.de.po                           | 19712 +++++++++++--------
 tests/status.scm                                   |    59 +-
 tests/upstream.scm                                 |     3 +
 88 files changed, 15689 insertions(+), 12878 deletions(-)

diff --cc gnu/local.mk
index f339f32,7481b39..ee8b13d
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1229,9 -1244,9 +1237,10 @@@ dist_patch_DATA =                              
                
    %D%/packages/patches/soundconverter-remove-gconf-dependency.patch   \
    %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch  \
    %D%/packages/patches/soundtouch-CVE-2018-1000223.patch      \
 +  %D%/packages/patches/sssd-curl-compat.patch                 \
    %D%/packages/patches/steghide-fixes.patch                   \
    %D%/packages/patches/streamlink-update-test.patch           \
+   %D%/packages/patches/superlu-dist-awpm-grid.patch           \
    %D%/packages/patches/superlu-dist-scotchmetis.patch         \
    %D%/packages/patches/swig-guile-gc.patch                    \
    %D%/packages/patches/swish-e-search.patch                   \



reply via email to

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