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: Tobias Geerinckx-Rice
Subject: 01/01: Merge branch 'master' into core-updates
Date: Wed, 25 Oct 2017 14:31:25 -0400 (EDT)

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

commit b7883b111d92746ff3bedb6f4bb4c1578068fc59
Merge: c27e8c1 63bbf38
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Wed Oct 25 20:02:08 2017 +0200

    Merge branch 'master' into core-updates

 gnu/local.mk                                       |   1 +
 gnu/packages/bioinformatics.scm                    |   9 +-
 gnu/packages/cran.scm                              |   2 +
 gnu/packages/crypto.scm                            |  32 ++
 gnu/packages/databases.scm                         |  16 +
 gnu/packages/glib.scm                              |  61 ++-
 gnu/packages/gnunet.scm                            |   4 +-
 gnu/packages/gnupg.scm                             |  90 +++++
 gnu/packages/golang.scm                            |   6 +-
 gnu/packages/maths.scm                             |  41 +-
 gnu/packages/music.scm                             |  28 ++
 .../crypto++-fix-dos-in-asn.1-decoders.patch       |  65 ++++
 gnu/packages/perl.scm                              | 415 ++++++++++++++++++++-
 gnu/packages/sssd.scm                              |  15 +-
 gnu/packages/statistics.scm                        |  25 ++
 gnu/packages/tor.scm                               |   4 +-
 gnu/packages/web.scm                               |  42 +++
 gnu/packages/xml.scm                               |   6 +-
 18 files changed, 801 insertions(+), 61 deletions(-)

diff --cc gnu/packages/xml.scm
index 13eb608,4e69449..2364184
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -57,14 -57,15 +57,14 @@@
  (define-public expat
    (package
      (name "expat")
-     (version "2.2.2")
 -    (version "2.2.1")
 -    (replacement expat-2.2.4)
++    (version "2.2.4")
      (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/expat/expat/"
                                   version "/expat-" version ".tar.bz2"))
               (sha256
                (base32
-                "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3"))))
 -               "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q"))))
++               "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83"))))
      (build-system gnu-build-system)
      (home-page "http://www.libexpat.org/";)
      (synopsis "Stream-oriented XML parser library written in C")



reply via email to

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