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: Sun, 4 Dec 2016 16:42:51 +0000 (UTC)

mbakke pushed a commit to branch staging
in repository guix.

commit a351fc83694f436c3bff7cbdef09bd3cc91c74fc
Merge: 80b63e6 d1a5b20
Author: Marius Bakke <address@hidden>
Date:   Sun Dec 4 17:41:36 2016 +0100

    Merge branch 'master' into staging

 doc/guix.texi                                      |  100 +-
 gnu/local.mk                                       |   18 +-
 gnu/packages/assembly.scm                          |   23 +-
 gnu/packages/audio.scm                             |   36 +-
 gnu/packages/bioinformatics.scm                    |    4 +-
 gnu/packages/bittorrent.scm                        |   41 +
 gnu/packages/connman.scm                           |   36 +
 gnu/packages/databases.scm                         |   20 +-
 gnu/packages/dns.scm                               |   94 ++
 gnu/packages/docbook.scm                           |   13 +-
 gnu/packages/ebook.scm                             |    3 +
 gnu/packages/emacs.scm                             |   25 +-
 gnu/packages/enlightenment.scm                     |   31 +
 gnu/packages/feh.scm                               |   67 --
 gnu/packages/flashing-tools.scm                    |   36 +
 gnu/packages/geeqie.scm                            |  108 --
 gnu/packages/glib.scm                              |    4 +-
 gnu/packages/gnome.scm                             |    1 -
 gnu/packages/gnunet.scm                            |    1 -
 gnu/packages/gnuzilla.scm                          |   95 +-
 gnu/packages/golang.scm                            |    6 +-
 gnu/packages/gps.scm                               |    2 +-
 gnu/packages/gstreamer.scm                         |   32 +-
 gnu/packages/gtk.scm                               |   19 +
 gnu/packages/image-viewers.scm                     |  132 ++-
 gnu/packages/image.scm                             |   35 +
 gnu/packages/kde.scm                               |   56 ++
 gnu/packages/linux.scm                             |   20 +-
 gnu/packages/mail.scm                              |   28 +-
 gnu/packages/maths.scm                             |    7 +-
 gnu/packages/monitoring.scm                        |  122 +++
 gnu/packages/mp3.scm                               |    4 +-
 gnu/packages/music.scm                             |  117 +++
 gnu/packages/package-management.scm                |    6 +-
 gnu/packages/patches/fcgi-2.4.0-gcc44-fixes.patch  |   14 +
 gnu/packages/patches/fcgi-2.4.0-poll.patch         |   89 ++
 .../patches/gst-plugins-good-fix-crashes.patch     | 1047 --------------------
 .../gst-plugins-good-fix-invalid-read.patch        |   37 -
 .../patches/gst-plugins-good-fix-signedness.patch  |   58 --
 .../gst-plugins-good-flic-bounds-check.patch       |  319 ------
 gnu/packages/patches/icecat-CVE-2016-9064.patch    |  996 -------------------
 gnu/packages/patches/nasm-no-ps-pdf.patch          |   20 -
 gnu/packages/patches/netcdf-config-date.patch      |   47 -
 gnu/packages/patches/netcdf-date-time.patch        |   11 +
 gnu/packages/patches/netcdf-tst_h_par.patch        |   21 +
 gnu/packages/patches/vtk-mesa-10.patch             |   36 -
 gnu/packages/perl.scm                              |    8 +-
 gnu/packages/pretty-print.scm                      |   46 +-
 gnu/packages/python.scm                            |   17 +-
 gnu/packages/qemu.scm                              |    1 +
 gnu/packages/qt.scm                                |   33 +
 gnu/packages/serialization.scm                     |    2 +
 gnu/packages/sxiv.scm                              |   62 --
 gnu/packages/{owncloud.scm => sync.scm}            |   57 +-
 gnu/packages/tls.scm                               |    6 +-
 gnu/packages/tor.scm                               |    4 +-
 gnu/packages/version-control.scm                   |   14 +
 gnu/packages/vtk.scm                               |   50 +-
 gnu/packages/web.scm                               |  155 ++-
 gnu/packages/xml.scm                               |   33 +-
 gnu/services/base.scm                              |   38 +-
 gnu/services/configuration.scm                     |    2 +
 gnu/services/cups.scm                              |    2 +-
 gnu/services/kerberos.scm                          |  378 ++++++-
 guix/scripts/offload.scm                           |  107 +-
 guix/store.scm                                     |    3 +-
 nix/nix-daemon/nix-daemon.cc                       |    7 +-
 67 files changed, 1914 insertions(+), 3148 deletions(-)




reply via email to

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