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: Marius Bakke
Subject: 01/01: Merge branch 'master' into core-updates
Date: Tue, 24 Oct 2017 16:00:53 -0400 (EDT)

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

commit ca4fd41de892c7055ce140863382c332441b15d3
Merge: 7276eca 648c896
Author: Marius Bakke <address@hidden>
Date:   Tue Oct 24 22:00:23 2017 +0200

    Merge branch 'master' into core-updates

 Makefile.am                                        |    1 +
 build-aux/build-self.scm                           |    1 +
 build-aux/compile-all.scm                          |  125 +--
 doc/guix.texi                                      |  141 ++-
 gnu/local.mk                                       |    5 +
 gnu/packages/animation.scm                         |   71 ++
 gnu/packages/audio.scm                             |   27 +-
 gnu/packages/backup.scm                            |   12 +-
 gnu/packages/base.scm                              |   13 +
 gnu/packages/bioinformatics.scm                    |    5 +-
 gnu/packages/compression.scm                       |   22 +
 gnu/packages/curl.scm                              |   14 +
 gnu/packages/databases.scm                         |    8 +-
 gnu/packages/django.scm                            |    3 +-
 gnu/packages/embedded.scm                          |   65 ++
 gnu/packages/games.scm                             |    3 +-
 gnu/packages/gnupg.scm                             |   40 +-
 gnu/packages/gnuzilla.scm                          |   11 +-
 gnu/packages/graphviz.scm                          |    5 +-
 gnu/packages/haskell.scm                           | 1114 +++++++++++++++++++-
 gnu/packages/icu4c.scm                             |   10 +
 gnu/packages/java.scm                              |  211 ++++
 gnu/packages/linux.scm                             |   12 +-
 gnu/packages/lxqt.scm                              |   56 -
 gnu/packages/mail.scm                              |    2 +
 gnu/packages/music.scm                             |   38 +
 gnu/packages/networking.scm                        |   41 +
 .../patches/glibc-CVE-2017-15670-15671.patch       |   27 +
 gnu/packages/patches/icu4c-CVE-2017-14952.patch    |   18 +
 gnu/packages/patches/mupdf-CVE-2017-14685.patch    |   34 +
 gnu/packages/patches/mupdf-CVE-2017-14686.patch    |   34 +
 gnu/packages/patches/mupdf-CVE-2017-14687.patch    |  130 +++
 gnu/packages/pdf.scm                               |    7 +-
 gnu/packages/perl.scm                              |  187 ++++
 gnu/packages/python.scm                            |   17 +-
 gnu/packages/screen.scm                            |    4 +-
 gnu/packages/syncthing.scm                         |   39 +-
 gnu/packages/version-control.scm                   |    6 +-
 gnu/packages/virtualization.scm                    |  102 +-
 gnu/packages/web.scm                               |  611 +++++++++++
 gnu/packages/xml.scm                               |  158 +++
 gnu/services.scm                                   |   37 +-
 gnu/services/base.scm                              |   17 +
 guix/build-system/go.scm                           |    2 +
 guix/build/compile.scm                             |  165 +++
 guix/build/go-build-system.scm                     |   10 +-
 guix/build/pull.scm                                |  115 +-
 guix/discovery.scm                                 |    8 +-
 guix/gexp.scm                                      |   52 +
 guix/modules.scm                                   |   10 +
 50 files changed, 3500 insertions(+), 346 deletions(-)

diff --cc gnu/packages/curl.scm
index df2310b,2e4a48d..cad2d6f
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -43,7 -42,8 +43,8 @@@
  (define-public curl
    (package
     (name "curl")
 -   (version "7.55.1")
 +   (version "7.56.0")
+    (replacement curl-7.56.1)
     (source (origin
              (method url-fetch)
              (uri (string-append "https://curl.haxx.se/download/curl-";



reply via email to

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