guix-commits
[Top][All Lists]
Advanced

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

01/02: Merge branch 'master' into staging


From: Marius Bakke
Subject: 01/02: Merge branch 'master' into staging
Date: Tue, 18 Apr 2017 12:57:37 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 8c4b4b65624198261d6e583214da9aa7c5524290
Merge: 40522a7 f881836
Author: Marius Bakke <address@hidden>
Date:   Tue Apr 18 18:30:13 2017 +0200

    Merge branch 'master' into staging

 doc/guix.texi                                      |  68 ++++++--
 gnu/build/vm.scm                                   |   9 +-
 gnu/local.mk                                       |   6 +-
 gnu/packages/admin.scm                             |   6 +-
 gnu/packages/algebra.scm                           |  37 ++--
 gnu/packages/benchmark.scm                         |   4 +-
 gnu/packages/bioinformatics.scm                    |   2 +-
 gnu/packages/certs.scm                             |   4 +-
 gnu/packages/databases.scm                         |  38 ++---
 gnu/packages/datastructures.scm                    |   2 +-
 gnu/packages/dns.scm                               |   8 +-
 gnu/packages/emacs.scm                             | 138 ++++++++++++++-
 gnu/packages/game-development.scm                  |  15 +-
 gnu/packages/games.scm                             |  12 +-
 gnu/packages/gnome.scm                             | 103 ++++++++++-
 gnu/packages/gnuzilla.scm                          |  10 +-
 gnu/packages/golang.scm                            |  15 +-
 gnu/packages/gtk.scm                               |  42 ++++-
 gnu/packages/guile.scm                             |  10 +-
 gnu/packages/icu4c.scm                             |  11 ++
 gnu/packages/idris.scm                             |  10 +-
 gnu/packages/kde-frameworks.scm                    |   4 +-
 gnu/packages/kodi.scm                              |  10 +-
 gnu/packages/libevent.scm                          |   2 +-
 gnu/packages/linux.scm                             |  95 +++++++++--
 gnu/packages/machine-learning.scm                  |   2 +-
 gnu/packages/mail.scm                              |  15 +-
 gnu/packages/mate.scm                              |   9 +-
 gnu/packages/maths.scm                             |   2 +-
 gnu/packages/music.scm                             |   2 +-
 gnu/packages/networking.scm                        |  11 +-
 gnu/packages/node.scm                              |   8 +-
 gnu/packages/package-management.scm                |   5 +-
 .../patches/ceph-disable-unittest-throttle.patch   |  52 ++++++
 .../icu4c-reset-keyword-list-iterator.patch        | 130 ++++++++++++++
 gnu/packages/patches/mupdf-CVE-2017-5896.patch     |  63 -------
 gnu/packages/patches/mupdf-CVE-2017-5991.patch     | 101 -----------
 .../patches/mupdf-build-with-openjpeg-2.1.patch    |  16 +-
 .../patches/mupdf-mujs-CVE-2016-10132.patch        | 188 ---------------------
 .../patches/mupdf-mujs-CVE-2016-10133.patch        |  36 ----
 gnu/packages/pdf.scm                               |  10 +-
 gnu/packages/perl.scm                              |   6 +-
 gnu/packages/plotutils.scm                         |   6 +-
 gnu/packages/pulseaudio.scm                        |  36 ++++
 gnu/packages/python.scm                            |   8 +-
 gnu/packages/samba.scm                             |   4 +-
 gnu/packages/scheme.scm                            |   4 +-
 gnu/packages/serialization.scm                     |   4 +-
 gnu/packages/speech.scm                            |   7 +-
 gnu/packages/storage.scm                           |   1 +
 gnu/packages/terminals.scm                         |   2 +-
 gnu/packages/text-editors.scm                      |   7 +-
 gnu/packages/video.scm                             | 111 ++++++++++--
 gnu/packages/vim.scm                               |   6 +-
 gnu/packages/xorg.scm                              |   6 +-
 gnu/services.scm                                   |  81 +++++++--
 gnu/services/admin.scm                             |   5 +-
 gnu/services/base.scm                              |   6 +-
 gnu/services/cups.scm                              |   4 +-
 gnu/services/dict.scm                              |   3 +-
 gnu/services/mcron.scm                             |   5 +-
 gnu/services/networking.scm                        |  21 ++-
 gnu/services/pm.scm                                |   3 +-
 gnu/services/ssh.scm                               |   5 +-
 gnu/system.scm                                     |  31 ++--
 gnu/system/grub.scm                                |   8 +-
 gnu/system/vm.scm                                  |  21 +--
 gnu/tests/base.scm                                 |   2 +-
 gnu/tests/dict.scm                                 |   9 +-
 gnu/tests/web.scm                                  |   1 -
 guix/download.scm                                  |   5 +
 guix/records.scm                                   |   9 +-
 guix/scripts/lint.scm                              |  66 ++++----
 guix/scripts/system.scm                            | 133 ++++++++-------
 guix/serialization.scm                             |   5 +-
 guix/ui.scm                                        |  20 ++-
 tests/services.scm                                 |  15 +-
 77 files changed, 1186 insertions(+), 791 deletions(-)

diff --cc gnu/packages/pulseaudio.scm
index 42fb5df,d258c59..cd79652
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -3,8 -3,8 +3,9 @@@
  ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
  ;;; Copyright © 2016 Efraim Flashner <address@hidden>
  ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
 +;;; Copyright © 2017 Thomas Danckaert <address@hidden>
  ;;; Copyright © 2017 Leo Famulari <address@hidden>
+ ;;; Copyright © 2017 Stefan Reichör <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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