guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into gnome-updates


From: ???
Subject: 01/01: Merge branch 'master' into gnome-updates
Date: Sun, 8 May 2016 09:55:21 +0000 (UTC)

iyzsong pushed a commit to branch gnome-updates
in repository guix.

commit 6655a74326beb18632b5c8277db39fd02a154007
Merge: 4e9d04a 2d4422d
Author: 宋文武 <address@hidden>
Date:   Sun May 8 17:54:46 2016 +0800

    Merge branch 'master' into gnome-updates

 .mailmap                                           |    5 +-
 Makefile.am                                        |   17 +-
 build-aux/run-system-tests.scm                     |   71 +++++++
 build-aux/test-env.in                              |   14 +-
 doc/guix.texi                                      |   14 +-
 emacs/guix-main.scm                                |    1 +
 gnu/build/marionette.scm                           |  206 ++++++++++++++++++++
 gnu/local.mk                                       |   14 +-
 gnu/packages.scm                                   |    1 +
 gnu/packages/admin.scm                             |   12 +-
 gnu/packages/base.scm                              |   30 ++-
 gnu/packages/bash.scm                              |   43 ++++
 gnu/packages/bootstrap.scm                         |    3 +-
 gnu/packages/cdrom.scm                             |   20 +-
 gnu/packages/connman.scm                           |   89 +++++++++
 gnu/packages/databases.scm                         |    6 +-
 gnu/packages/dns.scm                               |    4 +-
 gnu/packages/games.scm                             |    5 +-
 gnu/packages/gnupg.scm                             |    6 +-
 gnu/packages/image.scm                             |    5 +-
 gnu/packages/imagemagick.scm                       |    5 +-
 gnu/packages/java.scm                              |    2 +-
 gnu/packages/jemalloc.scm                          |    4 +-
 gnu/packages/linux.scm                             |   64 +++++-
 gnu/packages/mail.scm                              |    8 +-
 gnu/packages/music.scm                             |   44 +++++
 gnu/packages/ntp.scm                               |    4 +-
 ...gnupg-simple-query-ignore-status-messages.patch |  142 --------------
 gnu/packages/patches/imagemagick-test-segv.patch   |   20 --
 gnu/packages/patches/imlib2-CVE-2016-4024.patch    |   52 -----
 gnu/packages/patches/tvtime-gcc41.patch            |   58 ------
 gnu/packages/patches/tvtime-pngoutput.patch        |   15 --
 gnu/packages/patches/tvtime-videodev2.patch        |   15 --
 gnu/packages/patches/tvtime-xmltv.patch            |   28 ---
 gnu/packages/statistics.scm                        |   75 ++++++-
 gnu/packages/tls.scm                               |    7 +-
 gnu/packages/tv.scm                                |   25 ++-
 gnu/packages/version-control.scm                   |    4 +-
 gnu/packages/web.scm                               |    4 +-
 gnu/packages/wm.scm                                |   19 +-
 gnu/services/herd.scm                              |   82 +++++---
 gnu/services/networking.scm                        |   49 ++++-
 gnu/system.scm                                     |   18 ++
 gnu/system/shadow.scm                              |    5 +-
 gnu/system/vm.scm                                  |    3 +-
 gnu/tests.scm                                      |  130 ++++++++++++
 gnu/tests/base.scm                                 |  168 ++++++++++++++++
 guix/build-system/gnu.scm                          |    1 +
 guix/build-system/python.scm                       |    1 +
 guix/build/syscalls.scm                            |   76 ++++++++
 guix/combinators.scm                               |  116 +++++++++++
 guix/derivations.scm                               |    1 +
 guix/gnu-maintenance.scm                           |    3 +-
 guix/import/elpa.scm                               |    4 +-
 guix/nar.scm                                       |    4 +-
 guix/scripts/archive.scm                           |    1 +
 guix/scripts/build.scm                             |    1 +
 guix/scripts/environment.scm                       |   10 +-
 guix/scripts/graph.scm                             |    2 +-
 guix/scripts/lint.scm                              |    1 +
 guix/scripts/size.scm                              |    2 +-
 guix/scripts/substitute.scm                        |    1 +
 guix/scripts/system.scm                            |  142 +++++++++-----
 guix/serialization.scm                             |    4 +-
 guix/store.scm                                     |    1 +
 guix/ui.scm                                        |    1 +
 guix/utils.scm                                     |  191 +-----------------
 tests/combinators.scm                              |   85 ++++++++
 tests/syscalls.scm                                 |   88 +++++++++
 tests/utils.scm                                    |  152 ---------------
 70 files changed, 1657 insertions(+), 847 deletions(-)

diff --cc gnu/local.mk
index aba73d4,cea6a73..ef747dc
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -541,9 -548,6 +545,7 @@@ dist_patch_DATA =                                  
        
    gnu/packages/patches/icu4c-CVE-2015-1270.patch              \
    gnu/packages/patches/icu4c-CVE-2015-4760.patch              \
    gnu/packages/patches/ilmbase-fix-tests.patch                        \
-   gnu/packages/patches/imagemagick-test-segv.patch            \
-   gnu/packages/patches/imlib2-CVE-2016-4024.patch             \
 +  gnu/packages/patches/inkscape-drop-wait-for-targets.patch   \
    gnu/packages/patches/irrlicht-mesa-10.patch                 \
    gnu/packages/patches/jasper-CVE-2007-2721.patch             \
    gnu/packages/patches/jasper-CVE-2008-3520.patch             \



reply via email to

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