guix-commits
[Top][All Lists]
Advanced

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

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


From: Mark H. Weaver
Subject: 01/01: Merge branch 'master' into core-updates
Date: Wed, 19 Oct 2016 14:56:16 +0000 (UTC)

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

commit d2478b4cdd6f1db44f4725b39489aca89d3d9180
Merge: c9a71c6 152ffe7
Author: Mark H Weaver <address@hidden>
Date:   Wed Oct 19 10:54:36 2016 -0400

    Merge branch 'master' into core-updates

 doc/guix.texi                                      |   24 +
 gnu/build/linux-container.scm                      |   20 +-
 gnu/local.mk                                       |   24 +-
 gnu/packages/bioinformatics.scm                    |   93 ++
 gnu/packages/chez.scm                              |  472 ++++++++++
 gnu/packages/databases.scm                         |    8 +-
 gnu/packages/dns.scm                               |   33 +
 gnu/packages/engineering.scm                       |  102 +++
 gnu/packages/enlightenment.scm                     |    4 +-
 gnu/packages/games.scm                             |   33 +
 gnu/packages/gl.scm                                |    9 +-
 gnu/packages/haskell.scm                           |  306 ++++++-
 gnu/packages/image.scm                             |   28 +-
 gnu/packages/mail.scm                              |  125 ++-
 gnu/packages/maths.scm                             |    3 +-
 gnu/packages/networking.scm                        |   25 +
 gnu/packages/package-management.scm                |    4 +-
 gnu/packages/patches/jasper-CVE-2007-2721.patch    |   20 -
 gnu/packages/patches/jasper-CVE-2008-3520.patch    |  931 --------------------
 gnu/packages/patches/jasper-CVE-2008-3522.patch    |   14 -
 .../jasper-CVE-2011-4516-and-CVE-2011-4517.patch   |   31 -
 gnu/packages/patches/jasper-CVE-2014-8137.patch    |   64 --
 gnu/packages/patches/jasper-CVE-2014-8138.patch    |   21 -
 gnu/packages/patches/jasper-CVE-2014-8157.patch    |   19 -
 gnu/packages/patches/jasper-CVE-2014-8158.patch    |  336 -------
 gnu/packages/patches/jasper-CVE-2014-9029.patch    |   36 -
 gnu/packages/patches/jasper-CVE-2016-1577.patch    |   19 -
 gnu/packages/patches/jasper-CVE-2016-1867.patch    |   18 -
 gnu/packages/patches/jasper-CVE-2016-2089.patch    |   90 --
 gnu/packages/patches/jasper-CVE-2016-2116.patch    |   19 -
 .../kobodeluxe-const-charp-conversion.patch        |   17 +
 .../patches/kobodeluxe-enemies-pipe-decl.patch     |   67 ++
 .../kobodeluxe-graphics-window-signed-char.patch   |   38 +
 .../kobodeluxe-manpage-minus-not-hyphen.patch      |   15 +
 .../kobodeluxe-midicon-segmentation-fault.patch    |   24 +
 gnu/packages/patches/kobodeluxe-paths.patch        |   43 +
 gnu/packages/patches/torsocks-dns-test.patch       |   18 -
 gnu/packages/python.scm                            |    4 +-
 gnu/packages/scheme.scm                            |  154 ----
 gnu/packages/tor.scm                               |   29 +-
 gnu/packages/video.scm                             |    4 +-
 gnu/packages/zile.scm                              |   26 +-
 guix/build/graft.scm                               |    5 -
 guix/derivations.scm                               |    4 +-
 guix/ftp-client.scm                                |    4 +-
 guix/grafts.scm                                    |   15 +-
 guix/hash.scm                                      |    4 +-
 guix/http-client.scm                               |    2 +-
 guix/pki.scm                                       |    9 +-
 guix/scripts/archive.scm                           |    4 +-
 guix/scripts/authenticate.scm                      |    9 +-
 guix/scripts/build.scm                             |   84 +-
 guix/scripts/download.scm                          |    2 +-
 guix/scripts/hash.scm                              |    4 +-
 guix/scripts/lint.scm                              |   15 +
 guix/scripts/offload.scm                           |   11 +-
 guix/scripts/publish.scm                           |    6 +-
 guix/scripts/refresh.scm                           |    2 +-
 guix/scripts/substitute.scm                        |    5 +-
 guix/serialization.scm                             |    5 +-
 guix/store.scm                                     |    4 +-
 guix/tests.scm                                     |    2 +-
 guix/utils.scm                                     |    3 +-
 tests/containers.scm                               |    9 +
 tests/grafts.scm                                   |   48 +
 tests/lint.scm                                     |    8 +
 tests/scripts-build.scm                            |   19 +
 tests/syscalls.scm                                 |   35 +-
 68 files changed, 1712 insertions(+), 1976 deletions(-)

diff --cc gnu/local.mk
index 1c91e79,c2a0df0..cda33e1
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -603,21 -606,7 +605,8 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/id3lib-CVE-2007-4460.patch                     \
    %D%/packages/patches/ilmbase-fix-tests.patch                        \
    %D%/packages/patches/inkscape-drop-wait-for-targets.patch   \
 +  %D%/packages/patches/isl-0.11.1-aarch64-support.patch       \
    %D%/packages/patches/jansson-CVE-2016-4425.patch            \
-   %D%/packages/patches/jasper-CVE-2007-2721.patch             \
-   %D%/packages/patches/jasper-CVE-2008-3520.patch             \
-   %D%/packages/patches/jasper-CVE-2008-3522.patch             \
-   %D%/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch \
-   %D%/packages/patches/jasper-CVE-2014-8137.patch             \
-   %D%/packages/patches/jasper-CVE-2014-8138.patch             \
-   %D%/packages/patches/jasper-CVE-2014-8157.patch             \
-   %D%/packages/patches/jasper-CVE-2014-8158.patch             \
-   %D%/packages/patches/jasper-CVE-2014-9029.patch             \
-   %D%/packages/patches/jasper-CVE-2016-1577.patch             \
-   %D%/packages/patches/jasper-CVE-2016-1867.patch             \
-   %D%/packages/patches/jasper-CVE-2016-2089.patch             \
-   %D%/packages/patches/jasper-CVE-2016-2116.patch             \
    %D%/packages/patches/jbig2dec-ignore-testtest.patch         \
    %D%/packages/patches/jq-CVE-2015-8863.patch                 \
    %D%/packages/patches/khmer-use-libraries.patch                \



reply via email to

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