guix-commits
[Top][All Lists]
Advanced

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

01/01: Merge branch 'master' into staging


From: Leo Famulari
Subject: 01/01: Merge branch 'master' into staging
Date: Fri, 14 Apr 2017 13:23:30 -0400 (EDT)

lfam pushed a commit to branch staging
in repository guix.

commit c57ce31a896f659a2e311c2ee90b9027f4a405bc
Merge: f575efa 8439c9c
Author: Leo Famulari <address@hidden>
Date:   Fri Apr 14 13:07:16 2017 -0400

    Merge branch 'master' into staging

 Makefile.am                                        |   9 +-
 build-aux/download.scm                             |  20 +-
 doc/guix.texi                                      | 129 +++++++-
 gnu/build/file-systems.scm                         |  23 +-
 gnu/build/linux-boot.scm                           |   2 +
 gnu/build/linux-modules.scm                        |   2 +
 gnu/build/vm.scm                                   |   1 +
 gnu/local.mk                                       |  29 +-
 gnu/packages/admin.scm                             |  92 +++++-
 gnu/packages/algebra.scm                           |  17 +-
 gnu/packages/audacity.scm                          | 103 ------
 gnu/packages/audio.scm                             | 141 ++++++--
 gnu/packages/bioinformatics.scm                    | 230 ++++++-------
 gnu/packages/build-tools.scm                       |  64 ++++
 gnu/packages/calendar.scm                          |   4 +-
 gnu/packages/certs.scm                             |   4 +-
 gnu/packages/compression.scm                       |  12 +-
 gnu/packages/databases.scm                         |  20 +-
 gnu/packages/django.scm                            |  63 +++-
 gnu/packages/dns.scm                               |   8 +-
 gnu/packages/emacs.scm                             | 351 ++++++++++++++++++--
 gnu/packages/games.scm                             | 355 ++++++++++++++++++++-
 gnu/packages/gl.scm                                |  50 +++
 gnu/packages/gnome.scm                             |  48 ++-
 gnu/packages/gnucash.scm                           |   4 +-
 gnu/packages/gnupg.scm                             |   9 +-
 gnu/packages/gnuzilla.scm                          |  29 +-
 gnu/packages/guile.scm                             |  64 +++-
 gnu/packages/image-viewers.scm                     | 102 +++++-
 gnu/packages/image.scm                             |   3 +-
 gnu/packages/julia.scm                             |   6 +-
 gnu/packages/kde-frameworks.scm                    | 308 +++++++++---------
 gnu/packages/kde.scm                               |   8 +-
 gnu/packages/language.scm                          |  20 +-
 gnu/packages/ldc.scm                               |  25 +-
 gnu/packages/libusb.scm                            |  10 +-
 gnu/packages/linux.scm                             |  13 +-
 gnu/packages/lisp.scm                              |  53 ++-
 gnu/packages/logging.scm                           |   6 +-
 gnu/packages/lxde.scm                              |   7 +-
 gnu/packages/mail.scm                              | 229 ++++++++++---
 gnu/packages/maths.scm                             |  32 +-
 gnu/packages/mpd.scm                               |   8 +-
 gnu/packages/music.scm                             | 289 +++++++++--------
 gnu/packages/nano.scm                              |   4 +-
 gnu/packages/package-management.scm                |   5 +-
 gnu/packages/password-utils.scm                    |   5 +-
 .../patches/audacity-fix-ffmpeg-binding.patch      |  32 --
 gnu/packages/patches/glog-gcc-5-demangling.patch   |  64 ++++
 .../patches/gnupg-2.1-fix-Y2038-test-failure.patch |  67 ----
 gnu/packages/patches/jasper-CVE-2017-6850.patch    | 284 +++++++++++++++++
 .../patches/kiki-level-selection-crash.patch       |  19 ++
 gnu/packages/patches/kiki-makefile.patch           |  57 ++++
 gnu/packages/patches/kiki-missing-includes.patch   |  55 ++++
 gnu/packages/patches/kiki-portability-64bit.patch  | 328 +++++++++++++++++++
 gnu/packages/patches/kio-CVE-2017-6410.patch       |  53 ---
 .../patches/luminance-hdr-qt-printer.patch         |  28 ++
 gnu/packages/patches/lz4-fix-test-failures.patch   | 136 ++++++++
 ...networkmanager-qt-activeconnection-test-1.patch |  60 ++++
 ...networkmanager-qt-activeconnection-test-2.patch |  57 ++++
 .../patches/nss-increase-test-timeout.patch        |  10 +-
 .../patches/password-store-gnupg-compat.patch      |  53 ---
 gnu/packages/patches/pcre-CVE-2017-7186.patch      |  56 ++++
 gnu/packages/patches/pcre2-CVE-2017-7186.patch     |  68 ++++
 .../patches/python-cython-fix-tests-32bit.patch    |  27 ++
 gnu/packages/patches/qemu-CVE-2017-2615.patch      |  52 ---
 gnu/packages/patches/qemu-CVE-2017-2620.patch      | 134 --------
 gnu/packages/patches/qemu-CVE-2017-2630.patch      |  47 ---
 gnu/packages/patches/qemu-CVE-2017-5667.patch      |  46 ---
 gnu/packages/patches/qemu-CVE-2017-5931.patch      |  55 ----
 .../patches/screen-fix-info-syntax-error.patch     |  47 +++
 .../patches/teeworlds-use-latest-wavpack.patch     |  84 +++++
 gnu/packages/pcre.scm                              |  13 +-
 gnu/packages/pdf.scm                               |  47 +++
 gnu/packages/php.scm                               |   4 +-
 gnu/packages/pulseaudio.scm                        |   1 +
 gnu/packages/python.scm                            |  28 +-
 gnu/packages/qemu.scm                              |  12 +-
 gnu/packages/ratpoison.scm                         |   7 +-
 gnu/packages/rdf.scm                               |  14 +-
 gnu/packages/regex.scm                             |   4 +-
 gnu/packages/rust.scm                              |  70 +++-
 gnu/packages/samba.scm                             |  47 +++
 gnu/packages/screen.scm                            |   1 +
 gnu/packages/statistics.scm                        | 258 ++++++++-------
 gnu/packages/suckless.scm                          |   6 +-
 gnu/packages/tcl.scm                               |  33 ++
 gnu/packages/text-editors.scm                      |  29 ++
 gnu/packages/tls.scm                               |  63 ++--
 gnu/packages/tor.scm                               |  16 +
 gnu/packages/version-control.scm                   | 123 ++++++-
 gnu/packages/video.scm                             |  30 +-
 gnu/packages/{dillo.scm => web-browsers.scm}       |   2 +-
 gnu/packages/web.scm                               |  37 +--
 gnu/packages/webkit.scm                            |   4 +-
 gnu/packages/xml.scm                               |  56 +++-
 gnu/services.scm                                   |  11 +-
 gnu/services/cuirass.scm                           |   2 +-
 gnu/services/networking.scm                        |  32 +-
 gnu/system/examples/bare-bones.tmpl                |   4 +-
 guix/build-system/python.scm                       |  85 +++--
 guix/build/cargo-build-system.scm                  |  11 +-
 guix/build/profiles.scm                            |   6 +-
 guix/build/syscalls.scm                            | 169 ++++++----
 guix/download.scm                                  |   2 +-
 guix/gexp.scm                                      |  25 +-
 guix/import/cran.scm                               |  31 +-
 guix/monads.scm                                    |  25 +-
 guix/packages.scm                                  |  68 ++--
 guix/profiles.scm                                  |  79 +++++
 guix/scripts/build.scm                             |   7 +-
 guix/scripts/environment.scm                       |   4 +-
 guix/scripts/pack.scm                              |  31 +-
 guix/scripts/size.scm                              |   8 +-
 guix/scripts/system.scm                            |  31 +-
 guix/ui.scm                                        |   5 +
 guix/utils.scm                                     |   6 +-
 tests/gexp.scm                                     |   7 +
 tests/packages.scm                                 |  35 ++
 tests/search-paths.scm                             |   2 +-
 tests/size.scm                                     |  18 +-
 121 files changed, 4735 insertions(+), 1809 deletions(-)

diff --cc gnu/packages/pulseaudio.scm
index 578a2a3,71fcc3f..42fb5df
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@@ -3,7 -3,7 +3,8 @@@
  ;;; 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>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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