guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge remote-tracking branch 'origin/master' into core-updates


From: Efraim Flashner
Subject: 01/01: Merge remote-tracking branch 'origin/master' into core-updates
Date: Wed, 22 Mar 2017 07:07:45 -0400 (EDT)

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

commit 378de69c59ee0700c67b10b38592c213821b41f2
Merge: 049e02e d8be338
Author: Efraim Flashner <address@hidden>
Date:   Wed Mar 22 12:57:37 2017 +0200

    Merge remote-tracking branch 'origin/master' into core-updates

 Makefile.am                                       |   9 +-
 configure.ac                                      |   4 +-
 doc/guix.texi                                     |  16 +
 gnu/local.mk                                      |   2 -
 gnu/packages/astronomy.scm                        |   1 +
 gnu/packages/audacity.scm                         |   4 +-
 gnu/packages/backup.scm                           |  24 +-
 gnu/packages/bootloaders.scm                      |   6 +-
 gnu/packages/compton.scm                          |   3 -
 gnu/packages/display-managers.scm                 |   5 +-
 gnu/packages/dns.scm                              |  12 +-
 gnu/packages/game-development.scm                 |  51 ++-
 gnu/packages/games.scm                            | 154 +++++++++
 gnu/packages/gnome.scm                            |   4 +-
 gnu/packages/image.scm                            |   4 +-
 gnu/packages/kde-frameworks.scm                   |  22 +-
 gnu/packages/kodi.scm                             | 293 +++++++++++++----
 gnu/packages/linux.scm                            |   3 -
 gnu/packages/mail.scm                             |  54 +++-
 gnu/packages/messaging.scm                        | 112 +++++--
 gnu/packages/mpd.scm                              |   4 +-
 gnu/packages/music.scm                            |  53 ++++
 gnu/packages/ntp.scm                              |   4 +-
 gnu/packages/ots.scm                              |  34 +-
 gnu/packages/patches/ngircd-no-dns-in-tests.patch | 368 ----------------------
 gnu/packages/patches/vim-CVE-2017-5953.patch      |  32 --
 gnu/packages/perl.scm                             |  44 +++
 gnu/packages/pretty-print.scm                     |  29 +-
 gnu/packages/python.scm                           | 265 ++++++++++++++--
 gnu/packages/qt.scm                               |   1 +
 gnu/packages/ssh.scm                              |   4 +-
 gnu/packages/statistics.scm                       |  35 ++
 gnu/packages/text-editors.scm                     |   1 -
 gnu/packages/version-control.scm                  |  16 +-
 gnu/packages/video.scm                            |   4 +-
 gnu/packages/vim.scm                              |  29 +-
 gnu/packages/web.scm                              |  12 +-
 gnu/packages/wm.scm                               |  28 +-
 gnu/packages/wxwidgets.scm                        |  30 +-
 gnu/services/base.scm                             |   2 +
 gnu/services/ssh.scm                              | 110 ++++---
 gnu/system/file-systems.scm                       |  29 +-
 gnu/system/linux-initrd.scm                       |  23 +-
 gnu/tests/ssh.scm                                 | 109 +++++--
 guix/build/download.scm                           |  13 +-
 guix/download.scm                                 |   1 -
 guix/ftp-client.scm                               |   7 +-
 scripts/guix.in                                   |  11 +-
 tests/file-systems.scm                            |  12 +-
 49 files changed, 1318 insertions(+), 775 deletions(-)

diff --cc gnu/local.mk
index 256682e,97ca3eb..b8db871
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -778,10 -777,8 +778,9 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/netsurf-y2038-tests.patch              \
    %D%/packages/patches/netsurf-longer-test-timeout.patch      \
    %D%/packages/patches/ngircd-handle-zombies.patch            \
-   %D%/packages/patches/ngircd-no-dns-in-tests.patch           \
    %D%/packages/patches/ninja-zero-mtime.patch                 \
    %D%/packages/patches/node-9077.patch                                \
 +  %D%/packages/patches/nss-increase-test-timeout.patch                \
    %D%/packages/patches/nss-pkgconfig.patch                    \
    %D%/packages/patches/ntfs-3g-CVE-2017-0358.patch            \
    %D%/packages/patches/nvi-assume-preserve-path.patch         \



reply via email to

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