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: Mark H. Weaver
Subject: 01/02: Merge branch 'master' into core-updates
Date: Sat, 27 Feb 2016 13:56:06 +0000

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

commit 048ec1a8b092a87de08bfe410be65642522b63ed
Merge: fe5f687 b354617
Author: Mark H Weaver <address@hidden>
Date:   Sat Feb 27 08:52:23 2016 -0500

    Merge branch 'master' into core-updates

 Makefile.am                                        |    3 +
 doc.am                                             |    1 +
 doc/contributing.texi                              |    6 +-
 doc/emacs.texi                                     |   11 +-
 doc/guix.texi                                      |  901 ++-
 doc/htmlxref.cnf                                   |  652 ++
 emacs/guix-base.el                                 |   27 +-
 emacs/guix-buffer.el                               |    4 +-
 emacs/guix-build-log.el                            |    3 +
 emacs/guix-devel.el                                |    3 +
 emacs/guix-init.el                                 |    3 -
 emacs/guix-main.scm                                |    4 +-
 emacs/guix-profiles.el                             |    8 +
 emacs/guix-ui-package.el                           |   59 +-
 gnu-system.am                                      |   38 +-
 gnu/build/linux-modules.scm                        |   20 +-
 gnu/build/vm.scm                                   |   19 +-
 gnu/packages.scm                                   |   69 +-
 gnu/packages/abduco.scm                            |    7 +-
 gnu/packages/admin.scm                             |   79 +-
 gnu/packages/adns.scm                              |    6 +-
 gnu/packages/aidc.scm                              |   14 +-
 gnu/packages/algebra.scm                           |    4 +-
 gnu/packages/audio.scm                             |   46 +-
 gnu/packages/augeas.scm                            |   59 +
 gnu/packages/base.scm                              |    9 +-
 gnu/packages/bioinformatics.scm                    |  274 +-
 gnu/packages/bittorrent.scm                        |    6 +-
 gnu/packages/compression.scm                       |    2 +-
 gnu/packages/cpio.scm                              |    3 +-
 gnu/packages/curl.scm                              |   11 +-
 gnu/packages/databases.scm                         |   34 +-
 gnu/packages/dav.scm                               |    4 +-
 gnu/packages/dictionaries.scm                      |    5 +-
 gnu/packages/docker.scm                            |    1 -
 gnu/packages/dvtm.scm                              |    7 +-
 gnu/packages/ebook.scm                             |    4 +-
 gnu/packages/emacs.scm                             |  120 +-
 gnu/packages/engineering.scm                       |   68 +-
 gnu/packages/feh.scm                               |    5 +-
 gnu/packages/finance.scm                           |    7 +-
 gnu/packages/fonts.scm                             |    9 +-
 gnu/packages/fontutils.scm                         |   37 +-
 gnu/packages/freedesktop.scm                       |   31 +-
 gnu/packages/fribidi.scm                           |    5 +-
 gnu/packages/games.scm                             |   32 +-
 gnu/packages/gcc.scm                               |    4 +-
 gnu/packages/gdb.scm                               |    6 +-
 gnu/packages/ghostscript.scm                       |    2 +-
 gnu/packages/gl.scm                                |    4 +-
 gnu/packages/glib.scm                              |    4 +-
 gnu/packages/gnome.scm                             |  185 +-
 gnu/packages/gnunet.scm                            |   43 +-
 gnu/packages/gnupg.scm                             |   11 +-
 gnu/packages/gnuzilla.scm                          |    9 +-
 gnu/packages/gps.scm                               |   19 +-
 gnu/packages/gstreamer.scm                         |  134 +-
 gnu/packages/gtk.scm                               |   27 +-
 gnu/packages/guile.scm                             |   64 +-
 gnu/packages/icu4c.scm                             |   11 +-
 gnu/packages/kde-frameworks.scm                    |   23 +-
 gnu/packages/kde.scm                               |  229 -
 gnu/packages/ldc.scm                               |   45 +-
 gnu/packages/libcanberra.scm                       |    2 +-
 gnu/packages/linux.scm                             |   84 +-
 gnu/packages/lsh.scm                               |   57 +-
 gnu/packages/lua.scm                               |    2 +-
 gnu/packages/lxqt.scm                              |    9 +-
 gnu/packages/mail.scm                              |   42 +
 gnu/packages/mate.scm                              |  211 +
 gnu/packages/maths.scm                             |   10 +-
 gnu/packages/mit-krb5.scm                          |   70 +-
 gnu/packages/moe.scm                               |    5 +-
 gnu/packages/mpd.scm                               |   23 +-
 gnu/packages/music.scm                             |  156 +-
 gnu/packages/nano.scm                              |    4 +-
 gnu/packages/nettle.scm                            |   28 +-
 gnu/packages/ocaml.scm                             |   57 +
 gnu/packages/openbox.scm                           |    7 +-
 gnu/packages/openstack.scm                         |   20 +-
 gnu/packages/owncloud.scm                          |    6 +-
 gnu/packages/package-management.scm                |   51 +-
 gnu/packages/parallel.scm                          |   90 +-
 gnu/packages/patches/cpio-CVE-2016-2037.patch      |   49 +
 gnu/packages/patches/glibc-CVE-2015-7547.patch     |  559 ++
 ...gnupg-simple-query-ignore-status-messages.patch |  142 +
 gnu/packages/patches/icecat-update-graphite2.patch | 9988 ++++++++++++++++++++
 .../patches/libsndfile-CVE-2014-9496.patch         |   55 -
 .../patches/libsndfile-CVE-2015-7805.patch         |   95 -
 .../patches/libssh-0.6.5-CVE-2016-0739.patch       |   77 +
 gnu/packages/patches/libssh-CVE-2014-0017.patch    |   89 -
 .../patches/mit-krb5-CVE-2015-2695-pt1.patch       |  569 --
 .../patches/mit-krb5-CVE-2015-2695-pt2.patch       |   65 -
 gnu/packages/patches/mit-krb5-CVE-2015-2696.patch  |  736 --
 gnu/packages/patches/mit-krb5-CVE-2015-2697.patch  |   55 -
 .../patches/mit-krb5-CVE-2015-2698-pt1.patch       |   43 -
 .../patches/mit-krb5-CVE-2015-2698-pt2.patch       |  132 -
 gnu/packages/patches/mit-krb5-CVE-2015-8629.patch  |   51 +
 gnu/packages/patches/mit-krb5-CVE-2015-8630.patch  |   81 +
 gnu/packages/patches/mit-krb5-CVE-2015-8631.patch  |  576 ++
 .../mit-krb5-init-context-null-spnego.patch        |   49 +
 .../patches/ocaml-findlib-make-install.patch       |   20 +
 .../patches/python-paste-remove-timing-test.patch  |   16 +
 .../patches/python-paste-remove-website-test.patch |   21 +
 gnu/packages/patches/qemu-CVE-2015-8619.patch      |  119 +
 gnu/packages/patches/qemu-CVE-2016-1981.patch      |   95 +
 gnu/packages/patches/qemu-CVE-2016-2197.patch      |   40 +
 gnu/packages/patches/qemu-usb-ehci-oob-read.patch  |   49 +
 .../slurm-configure-remove-nonfree-contribs.patch  |   43 +
 gnu/packages/patches/tclxml-3.2-install.patch      |   17 +
 .../patches/xf86-video-mga-glibc-2.20.patch        |   17 -
 .../patches/xf86-video-r128-glibc-2.20.patch       |   17 -
 .../xf86-video-siliconmotion-remove-mibstore.patch |   16 -
 .../patches/xf86-video-sis-fix-exa-crash.patch     |   45 -
 .../patches/xf86-video-sis-update-api.patch        |  128 -
 .../patches/xf86-video-tdfx-remove-mibstore.patch  |   26 -
 .../xf86-video-trident-remove-mibstore.patch       |   23 -
 .../patches/xf86-video-vmware-glibc-2.20.patch     |   15 -
 gnu/packages/pdf.scm                               |    2 +-
 gnu/packages/perl.scm                              |   29 +-
 gnu/packages/pkg-config.scm                        |   14 +-
 gnu/packages/polkit.scm                            |    9 +-
 gnu/packages/pulseaudio.scm                        |   20 +-
 gnu/packages/pumpio.scm                            |    1 -
 gnu/packages/python.scm                            | 1029 ++-
 gnu/packages/qemu.scm                              |    6 +-
 gnu/packages/qt.scm                                |   37 +-
 gnu/packages/rdf.scm                               |   31 +-
 gnu/packages/ruby.scm                              |    2 +-
 gnu/packages/scheme.scm                            |    8 +-
 gnu/packages/screen.scm                            |    2 +-
 gnu/packages/ssh.scm                               |   61 +-
 gnu/packages/statistics.scm                        |   23 +-
 gnu/packages/tcl.scm                               |   75 +-
 gnu/packages/texlive.scm                           |   76 +-
 gnu/packages/textutils.scm                         |   31 +-
 gnu/packages/tls.scm                               |   98 +-
 gnu/packages/version-control.scm                   |    8 +-
 gnu/packages/video.scm                             |   98 +-
 gnu/packages/vim.scm                               |    8 +-
 gnu/packages/wine.scm                              |   18 +-
 gnu/packages/xdisorg.scm                           |   28 +-
 gnu/packages/xfce.scm                              |   46 +-
 gnu/packages/xnee.scm                              |    2 +-
 gnu/packages/xorg.scm                              |  365 +-
 gnu/packages/yasm.scm                              |    5 +-
 gnu/packages/yubico.scm                            |    9 +-
 gnu/packages/zsh.scm                               |    8 +-
 gnu/services/databases.scm                         |    3 +-
 gnu/services/desktop.scm                           |    2 +-
 gnu/services/herd.scm                              |    8 +-
 gnu/services/xorg.scm                              |   45 +
 gnu/system.scm                                     |   32 +-
 gnu/system/install.scm                             |    8 +-
 gnu/system/locale.scm                              |   32 +-
 gnu/system/vm.scm                                  |   10 +-
 guix/derivations.scm                               |   98 -
 guix/download.scm                                  |   29 +-
 guix/gexp.scm                                      |    3 +-
 guix/gnu-maintenance.scm                           |   37 +-
 guix/grafts.scm                                    |  146 +
 guix/http-client.scm                               |   18 +-
 guix/import/gem.scm                                |   63 +-
 guix/import/github.scm                             |  198 +
 guix/licenses.scm                                  |   26 +-
 guix/packages.scm                                  |    7 +-
 guix/profiles.scm                                  |   10 +-
 guix/scripts/build.scm                             |    1 +
 guix/scripts/environment.scm                       |  239 +-
 guix/scripts/package.scm                           |   12 +-
 guix/scripts/publish.scm                           |   31 +-
 guix/scripts/refresh.scm                           |   10 +-
 guix/scripts/system.scm                            |   23 +-
 guix/store.scm                                     |   29 +-
 tests/derivations.scm                              |   34 -
 tests/grafts.scm                                   |   81 +
 tests/guix-environment-container.sh                |    2 +-
 tests/guix-environment.sh                          |  104 +-
 tests/packages.scm                                 |    5 +-
 tests/publish.scm                                  |    8 +
 tests/store.scm                                    |   26 +-
 181 files changed, 17894 insertions(+), 4227 deletions(-)




reply via email to

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