guix-commits
[Top][All Lists]
Advanced

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

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


From: Leo Famulari
Subject: 01/05: Merge branch 'master' into core-updates
Date: Sun, 4 Jun 2017 15:16:19 -0400 (EDT)

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

commit 9f825cec1beb0174a218ee3af603a692e5aea81d
Merge: 8b4186e cc24bf9
Author: Leo Famulari <address@hidden>
Date:   Sun Jun 4 14:56:31 2017 -0400

    Merge branch 'master' into core-updates

 doc/guix.texi                                     |  30 +-
 gnu/build/file-systems.scm                        |   6 +-
 gnu/local.mk                                      |   5 +
 gnu/packages/android.scm                          | 101 ++++++
 gnu/packages/compression.scm                      |  77 +++++
 gnu/packages/game-development.scm                 |  25 +-
 gnu/packages/games.scm                            |  90 +++++-
 gnu/packages/image-processing.scm                 |   3 +-
 gnu/packages/kodi.scm                             |   6 +-
 gnu/packages/mes.scm                              |  10 +-
 gnu/packages/networking.scm                       |  52 +++
 gnu/packages/patches/libgit2-0.25.1-mtime-0.patch |  14 +
 gnu/packages/patches/qemu-CVE-2017-8112.patch     |  41 +++
 gnu/packages/patches/qemu-CVE-2017-8309.patch     |  46 +++
 gnu/packages/patches/qemu-CVE-2017-8379.patch     |  98 ++++++
 gnu/packages/patches/qemu-CVE-2017-8380.patch     |  53 +++
 gnu/packages/python.scm                           | 374 ++++++++++++++++++++++
 gnu/packages/qemu.scm                             |   6 +-
 gnu/packages/shells.scm                           | 105 ++++++
 gnu/packages/version-control.scm                  |  18 +-
 gnu/packages/video.scm                            |  78 ++++-
 gnu/packages/wine.scm                             |   5 +-
 guix/scripts/refresh.scm                          |  34 +-
 nix/nix-daemon/guix-daemon.cc                     |  12 +
 tests/guix-daemon.sh                              |  36 +++
 25 files changed, 1278 insertions(+), 47 deletions(-)

diff --cc gnu/local.mk
index 8b73f7e,0449e8a..015267f
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -723,8 -729,8 +723,9 @@@ dist_patch_DATA =                                  
        
    %D%/packages/patches/libevent-2.1-dns-tests.patch           \
    %D%/packages/patches/libevent-2.1-skip-failing-test.patch   \
    %D%/packages/patches/libextractor-ffmpeg-3.patch            \
+   %D%/packages/patches/libgit2-0.25.1-mtime-0.patch           \
    %D%/packages/patches/libgit2-use-after-free.patch           \
 +  %D%/packages/patches/libffi-3.2.1-complex-alpha.patch               \
    %D%/packages/patches/libjxr-fix-function-signature.patch    \
    %D%/packages/patches/libjxr-fix-typos.patch                 \
    %D%/packages/patches/liboop-mips64-deplibs-fix.patch                \



reply via email to

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