guix-commits
[Top][All Lists]
Advanced

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

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


From: Leo Famulari
Subject: 01/02: Merge branch 'master' into core-updates
Date: Thu, 2 Feb 2017 15:53:01 +0000 (UTC)

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

commit e8c83d04e176f205b30b3d470f22ee5e1c686331
Merge: d9b4cbc de643f0
Author: Leo Famulari <address@hidden>
Date:   Thu Feb 2 10:52:24 2017 -0500

    Merge branch 'master' into core-updates

 .dir-locals.el                                     |    2 +
 .mailmap                                           |   11 +-
 HACKING                                            |    4 +-
 Makefile.am                                        |    1 +
 README                                             |    2 +-
 doc/guix.texi                                      |  119 +++++-
 gnu/build/activation.scm                           |   19 +-
 gnu/build/file-systems.scm                         |   33 +-
 gnu/local.mk                                       |   12 +-
 gnu/packages.scm                                   |   34 +-
 gnu/packages/admin.scm                             |   22 +-
 gnu/packages/algebra.scm                           |    4 +-
 gnu/packages/benchmark.scm                         |   39 +-
 gnu/packages/bioinformatics.scm                    |  100 ++++-
 gnu/packages/bittorrent.scm                        |   51 ++-
 gnu/packages/bootstrap.scm                         |   39 +-
 gnu/packages/calendar.scm                          |    4 +-
 gnu/packages/ci.scm                                |    7 +-
 gnu/packages/compression.scm                       |   61 ++-
 gnu/packages/databases.scm                         |   91 ++++-
 gnu/packages/dns.scm                               |    4 +-
 gnu/packages/emacs.scm                             |  150 ++++++-
 gnu/packages/engineering.scm                       |    1 -
 gnu/packages/fonts.scm                             |   38 ++
 gnu/packages/ftp.scm                               |   18 +-
 gnu/packages/games.scm                             |   43 +-
 gnu/packages/gdb.scm                               |    4 +-
 gnu/packages/gnupg.scm                             |   71 ++--
 gnu/packages/gnuzilla.scm                          |    2 +-
 gnu/packages/gstreamer.scm                         |   28 +-
 gnu/packages/gtk.scm                               |   13 +-
 gnu/packages/haskell.scm                           |   31 +-
 gnu/packages/image-viewers.scm                     |   59 +++
 gnu/packages/java.scm                              |   24 +-
 gnu/packages/ldc.scm                               |  141 +++++++
 gnu/packages/libevent.scm                          |   34 +-
 gnu/packages/linux.scm                             |   75 +++-
 gnu/packages/lua.scm                               |   57 +++
 gnu/packages/mail.scm                              |   82 +++-
 gnu/packages/maths.scm                             |  106 ++++-
 gnu/packages/messaging.scm                         |   84 ++--
 gnu/packages/mg.scm                                |   46 ++-
 gnu/packages/mtools.scm                            |    4 +-
 gnu/packages/networking.scm                        |    4 +-
 gnu/packages/ocaml.scm                             |  329 ++++++++++++++++
 gnu/packages/parallel.scm                          |    4 +-
 gnu/packages/password-utils.scm                    |   13 +-
 ...dont-pass-linker-flags-via-response-files.patch |   27 ++
 gnu/packages/patches/httpd-CVE-2016-8740.patch     |   36 --
 .../patches/ldc-1.1.0-disable-dmd-tests.patch      |   35 ++
 .../patches/ldc-1.1.0-disable-phobos-tests.patch   |  414 ++++++++++++++++++++
 ...event-2.0-evdns-fix-remote-stack-overread.patch |   42 ++
 ...t-2.0-evdns-fix-searching-empty-hostnames.patch |   40 ++
 .../libevent-2.0-evutil-fix-buffer-overflow.patch  |   42 ++
 gnu/packages/patches/libevent-2.1-dns-tests.patch  |   26 ++
 .../patches/libevent-2.1-skip-failing-test.patch   |   24 ++
 .../patches/omake-fix-non-determinism.patch        |   41 ++
 gnu/packages/patches/xinetd-CVE-2013-4342.patch    |   36 ++
 gnu/packages/patches/xinetd-fix-fd-leak.patch      |   26 ++
 gnu/packages/plotutils.scm                         |    4 +-
 gnu/packages/polkit.scm                            |   26 ++
 gnu/packages/python.scm                            |   54 +--
 gnu/packages/regex.scm                             |    7 +-
 gnu/packages/ruby.scm                              |   46 ++-
 gnu/packages/scheme.scm                            |    1 -
 gnu/packages/search.scm                            |    4 +-
 gnu/packages/serialization.scm                     |   86 +++-
 gnu/packages/telephony.scm                         |    4 +-
 gnu/packages/text-editors.scm                      |  102 ++++-
 gnu/packages/tls.scm                               |   44 ++-
 gnu/packages/tor.scm                               |   80 +++-
 gnu/packages/tv.scm                                |    8 +-
 gnu/packages/u-boot.scm                            |    5 +-
 gnu/packages/video.scm                             |    4 +-
 gnu/packages/vim.scm                               |   84 +++-
 gnu/packages/web.scm                               |   35 +-
 gnu/packages/wine.scm                              |    4 +-
 gnu/packages/xdisorg.scm                           |    4 +-
 gnu/packages/xorg.scm                              |   45 ++-
 gnu/services/base.scm                              |  187 +++++----
 gnu/services/cuirass.scm                           |   11 +-
 gnu/services/networking.scm                        |  205 ++++++----
 gnu/system.scm                                     |    5 +-
 gnu/system/grub.scm                                |    4 +-
 gnu/system/shadow.scm                              |   38 +-
 gnu/tests/base.scm                                 |   37 ++
 gnu/tests/install.scm                              |   60 ++-
 guix/build-system/gnu.scm                          |   51 ++-
 guix/build-system/python.scm                       |   89 +++--
 guix/build/bournish.scm                            |   11 +-
 guix/build/r-build-system.scm                      |    3 +-
 guix/combinators.scm                               |   18 +-
 guix/derivations.scm                               |   89 +++--
 guix/download.scm                                  |   43 +-
 guix/gnu-maintenance.scm                           |  111 +++---
 guix/import/cran.scm                               |    4 +-
 guix/import/elpa.scm                               |    3 +-
 guix/import/github.scm                             |    5 +-
 guix/import/pypi.scm                               |    6 +-
 guix/memoization.scm                               |  114 ++++++
 guix/modules.scm                                   |   25 +-
 guix/packages.scm                                  |   70 ++--
 guix/scripts/build.scm                             |    1 -
 guix/scripts/copy.scm                              |    4 +-
 guix/scripts/environment.scm                       |    3 +-
 guix/scripts/graph.scm                             |   15 +-
 guix/scripts/lint.scm                              |   15 +-
 guix/serialization.scm                             |   12 +-
 guix/store.scm                                     |   37 +-
 guix/utils.scm                                     |   11 +-
 tests/bournish.scm                                 |   12 +
 tests/pypi.scm                                     |    6 +-
 tests/store.scm                                    |    5 +
 tests/syscalls.scm                                 |    2 +-
 114 files changed, 3971 insertions(+), 897 deletions(-)

diff --cc gnu/packages/compression.scm
index 873671c,73a3503..e0eca4e
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -7,10 -7,10 +7,10 @@@
  ;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
  ;;; Copyright © 2015 Leo Famulari <address@hidden>
  ;;; Copyright © 2015 Jeff Mickey <address@hidden>
 -;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
 +;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
  ;;; Copyright © 2016 Ben Woodcroft <address@hidden>
  ;;; Copyright © 2016 Danny Milosavljevic <address@hidden>
- ;;; Copyright © 2016 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <address@hidden>
  ;;; Copyright © 2016 David Craven <address@hidden>
  ;;; Copyright © 2016 Kei Kebreau <address@hidden>
  ;;; Copyright © 2016 Marius Bakke <address@hidden>
diff --cc gnu/packages/linux.scm
index aa49d40,def4be5..e5615c0
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -17,9 -17,9 +17,10 @@@
  ;;; Copyright © 2016 John Darrington <address@hidden>
  ;;; Copyright © 2016 Marius Bakke <address@hidden>
  ;;; Copyright © 2016 Rene Saavedra <address@hidden>
 +;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
  ;;; Copyright © 2016 ng0 <address@hidden>
  ;;; Copyright © 2017 Leo Famulari <address@hidden>
+ ;;; Copyright © 2017 José Miguel Sánchez García <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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