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: Wed, 23 Oct 2019 15:01:58 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 4c1918db34e09f0da793c607acc161bdf9ec5535
Merge: e806297 4163b6d
Author: Marius Bakke <address@hidden>
Date:   Wed Oct 23 20:48:55 2019 +0200

    Merge branch 'master' into staging

 Makefile.am                                        |    2 +-
 doc/build.scm                                      |   51 +-
 doc/guix.texi                                      |   77 +-
 gnu/local.mk                                       |    6 +
 gnu/machine/digital-ocean.scm                      |  422 +++++++
 gnu/packages/assembly.scm                          |    4 +
 gnu/packages/avahi.scm                             |   12 +
 gnu/packages/backup.scm                            |    1 -
 gnu/packages/bioconductor.scm                      |    4 +-
 gnu/packages/ci.scm                                |    6 +-
 gnu/packages/cpp.scm                               |   37 +
 gnu/packages/cran.scm                              |   12 +-
 gnu/packages/cross-base.scm                        |   13 +-
 gnu/packages/databases.scm                         |   73 +-
 gnu/packages/emacs-xyz.scm                         |  163 ++-
 gnu/packages/emulators.scm                         |   96 ++
 gnu/packages/enlightenment.scm                     |   10 +
 gnu/packages/fonts.scm                             |   27 +-
 gnu/packages/gnome.scm                             |   27 +-
 gnu/packages/guile.scm                             |   17 +-
 gnu/packages/linux.scm                             |    8 +-
 gnu/packages/lisp.scm                              |  250 ++++
 gnu/packages/machine-learning.scm                  |   36 +
 gnu/packages/make-bootstrap.scm                    |   55 +-
 gnu/packages/mingw.scm                             |   47 +-
 gnu/packages/multiprecision.scm                    |   43 +-
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/patches/avahi-CVE-2018-1000845.patch  |   42 +
 .../patches/sbcl-graph-asdf-definitions.patch      |   70 ++
 .../seahorse-gkr-use-0-on-empty-flags.patch        |   32 +
 .../patches/weasyprint-library-paths.patch         |   38 +
 gnu/packages/pdf.scm                               |  128 +-
 gnu/packages/perl.scm                              |    4 +-
 gnu/packages/python-check.scm                      |   31 +
 gnu/packages/python-web.scm                        |   74 +-
 gnu/packages/python-xyz.scm                        |  110 +-
 gnu/packages/rust-cbindgen.scm                     | 1019 ++++++++++++++++
 gnu/packages/statistics.scm                        |   20 +-
 gnu/packages/tls.scm                               |    7 +-
 gnu/packages/video.scm                             |    4 +-
 gnu/packages/web.scm                               |    9 +-
 gnu/packages/wine.scm                              |    7 +-
 gnu/services/base.scm                              |  229 ++--
 gnu/services/desktop.scm                           |   38 +-
 gnu/services/sddm.scm                              |   10 +-
 guix/build/download.scm                            |    3 +-
 guix/cve.scm                                       |  376 ++++--
 guix/lint.scm                                      |   16 +-
 tests/cve-sample.json                              | 1279 ++++++++++++++++++++
 tests/cve-sample.xml                               |  616 ----------
 tests/cve.scm                                      |   83 +-
 51 files changed, 4618 insertions(+), 1130 deletions(-)

diff --cc gnu/local.mk
index 7f69059,50bcab5..c6ddbf4
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1326,7 -1328,7 +1330,8 @@@ dist_patch_DATA =                               
                
    %D%/packages/patches/scotch-build-parallelism.patch         \
    %D%/packages/patches/scotch-integer-declarations.patch      \
    %D%/packages/patches/sdl-libx11-1.6.patch                   \
 +  %D%/packages/patches/sdl2-mesa-compat.patch                 \
+   %D%/packages/patches/seahorse-gkr-use-0-on-empty-flags.patch        \
    %D%/packages/patches/seq24-rename-mutex.patch                       \
    %D%/packages/patches/sharutils-CVE-2018-1000097.patch               \
    %D%/packages/patches/shishi-fix-libgcrypt-detection.patch   \



reply via email to

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