guix-commits
[Top][All Lists]
Advanced

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

01/02: Merge branch 'master' into core-updates


From: Marius Bakke
Subject: 01/02: Merge branch 'master' into core-updates
Date: Mon, 3 Sep 2018 13:26:58 -0400 (EDT)

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

commit 70dc8db8e7a44e0357c6b0582a710a918bd2e353
Merge: 279ed3e c702749
Author: Marius Bakke <address@hidden>
Date:   Mon Sep 3 19:20:06 2018 +0200

    Merge branch 'master' into core-updates

 Makefile.am                                        |   2 +
 NEWS                                               |  11 +
 build-aux/compile-as-derivation.scm                |  21 +-
 build-aux/update-NEWS.scm                          |   9 +-
 doc/guix.texi                                      | 465 +++++++++--
 gnu/build/linux-modules.scm                        |   4 +-
 gnu/build/marionette.scm                           |  28 +-
 gnu/local.mk                                       |   6 +-
 gnu/packages.scm                                   |  27 +-
 gnu/packages/admin.scm                             |  82 +-
 gnu/packages/audio.scm                             |  16 +-
 gnu/packages/backup.scm                            |  15 +-
 gnu/packages/bioinformatics.scm                    | 108 ++-
 gnu/packages/certs.scm                             |   4 +-
 gnu/packages/check.scm                             |   6 +-
 gnu/packages/cpp.scm                               |   2 +-
 gnu/packages/cran.scm                              |  44 ++
 gnu/packages/crypto.scm                            |   9 +-
 gnu/packages/dico.scm                              |   8 +-
 gnu/packages/disk.scm                              |   4 +-
 gnu/packages/emacs.scm                             |  69 +-
 gnu/packages/emulators.scm                         |  19 +-
 gnu/packages/engineering.scm                       |   2 +-
 gnu/packages/enlightenment.scm                     |  82 +-
 gnu/packages/finance.scm                           |  29 +-
 gnu/packages/game-development.scm                  |  19 +-
 gnu/packages/games.scm                             |  48 +-
 gnu/packages/gd.scm                                |   4 +-
 gnu/packages/glib.scm                              |   4 +-
 gnu/packages/gnu-pw-mgr.scm                        |   4 +-
 gnu/packages/gnupg.scm                             |   4 +-
 gnu/packages/gnuzilla.scm                          |   8 +-
 gnu/packages/graphics.scm                          |  24 +-
 gnu/packages/gsasl.scm                             |   7 +-
 gnu/packages/hardware.scm                          | 124 +++
 gnu/packages/haskell.scm                           | 129 ++-
 gnu/packages/javascript.scm                        |  13 +-
 gnu/packages/kde-frameworks.scm                    | 296 +++----
 gnu/packages/kde.scm                               |  29 +-
 gnu/packages/linux.scm                             |  51 +-
 gnu/packages/llvm.scm                              |  53 +-
 gnu/packages/lxde.scm                              |  48 ++
 gnu/packages/mail.scm                              |  34 +-
 gnu/packages/maths.scm                             |  19 +-
 gnu/packages/messaging.scm                         |  15 +-
 gnu/packages/monitoring.scm                        |  83 +-
 gnu/packages/music.scm                             |   7 +-
 gnu/packages/networking.scm                        |   4 +-
 gnu/packages/opencl.scm                            |  96 ++-
 gnu/packages/patches/dropbear-CVE-2018-15599.patch | 240 ++++++
 gnu/packages/patches/haskell-mode-make-check.patch |  35 +
 .../patches/haskell-mode-unused-variables.patch    |  44 ++
 .../patches/netsurf-message-timestamp.patch        |  11 +
 gnu/packages/patches/netsurf-system-utf8proc.patch |  25 +-
 gnu/packages/patches/openexr-missing-samples.patch |  23 -
 gnu/packages/patches/rust-1.19-mrustc.patch        |  28 +
 gnu/packages/perl.scm                              |   4 +-
 gnu/packages/photo.scm                             |  12 +
 gnu/packages/printers.scm                          |  21 +-
 gnu/packages/python.scm                            | 131 +++-
 gnu/packages/qt.scm                                |   9 +
 gnu/packages/regex.scm                             |   4 +-
 gnu/packages/ruby.scm                              | 871 ++++++++++++++++++++-
 gnu/packages/rust.scm                              | 335 +++++---
 gnu/packages/samba.scm                             |  11 +-
 gnu/packages/ssh.scm                               |   1 +
 gnu/packages/statistics.scm                        |   8 +-
 gnu/packages/tls.scm                               |   4 +-
 gnu/packages/video.scm                             |   3 +-
 gnu/packages/web.scm                               |  57 +-
 gnu/packages/wine.scm                              |   6 +-
 gnu/services/dns.scm                               | 168 +++-
 gnu/services/networking.scm                        |  36 +-
 gnu/services/ssh.scm                               |  10 +-
 gnu/services/web.scm                               |  16 +-
 gnu/tests.scm                                      |   4 +-
 gnu/tests/networking.scm                           |  97 ++-
 guix/channels.scm                                  | 292 +++++++
 guix/describe.scm                                  |  73 ++
 guix/discovery.scm                                 |  13 +-
 guix/import/hackage.scm                            |   1 +
 guix/import/pypi.scm                               | 173 ++--
 guix/import/stackage.scm                           |  45 +-
 guix/records.scm                                   |  17 +-
 guix/scripts/import/pypi.scm                       |  28 +-
 guix/scripts/import/stackage.scm                   |  46 +-
 guix/scripts/pack.scm                              |   4 +-
 guix/scripts/pull.scm                              | 218 +++---
 guix/self.scm                                      |   7 -
 po/guix/POTFILES.in                                |   1 +
 tests/records.scm                                  |   5 +-
 91 files changed, 4373 insertions(+), 959 deletions(-)

diff --cc gnu/local.mk
index 806a5f3,1924ae9..21f0482
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -649,7 -650,9 +650,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/dropbear-CVE-2018-15599.patch          \
    %D%/packages/patches/dvd+rw-tools-add-include.patch                 \
    %D%/packages/patches/elfutils-tests-ptrace.patch            \
    %D%/packages/patches/elogind-glibc-2.27.patch                       \



reply via email to

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