[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: Merge branch 'master' into staging
From: |
Marius Bakke |
Subject: |
03/03: Merge branch 'master' into staging |
Date: |
Mon, 4 Sep 2017 16:34:48 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit a76585e5535f433d37c0900cf0b2d3c9d3b3461c
Merge: 1dc32c2 c427fda
Author: Marius Bakke <address@hidden>
Date: Mon Sep 4 22:34:28 2017 +0200
Merge branch 'master' into staging
Makefile.am | 4 +-
doc/guix.texi | 16 +-
gnu/local.mk | 3 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 6 +-
.../linux-libre/{4.12-i686.conf => 4.13-i686.conf} | 190 ++++++++++++++------
.../{4.12-x86_64.conf => 4.13-x86_64.conf} | 191 ++++++++++++++------
gnu/packages/bioinformatics.scm | 14 +-
gnu/packages/ci.scm | 2 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/crypto.scm | 2 +-
gnu/packages/databases.scm | 6 +-
gnu/packages/debug.scm | 2 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs.scm | 84 ++++++++-
gnu/packages/embedded.scm | 4 +-
gnu/packages/engineering.scm | 20 +--
gnu/packages/erlang.scm | 2 +-
gnu/packages/ftp.scm | 2 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/gnunet.scm | 6 +-
gnu/packages/gnuzilla.scm | 193 ++-------------------
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile.scm | 16 +-
gnu/packages/ibus.scm | 6 +-
gnu/packages/image.scm | 4 +-
gnu/packages/irc.scm | 53 +++---
gnu/packages/java.scm | 2 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/libusb.scm | 2 +-
gnu/packages/linux.scm | 40 +++--
gnu/packages/logging.scm | 2 +-
gnu/packages/machine-learning.scm | 4 +-
gnu/packages/mail.scm | 8 +-
gnu/packages/mate.scm | 51 +++---
gnu/packages/maths.scm | 6 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/microcom.scm | 2 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 4 +-
gnu/packages/node.scm | 12 +-
gnu/packages/ocaml.scm | 4 +-
gnu/packages/parallel.scm | 5 +-
gnu/packages/patches/node-9077.patch | 31 ----
gnu/packages/patches/openjpeg-CVE-2017-14040.patch | 83 +++++++++
gnu/packages/patches/openjpeg-CVE-2017-14041.patch | 25 +++
gnu/packages/pdf.scm | 2 +-
gnu/packages/samba.scm | 2 +-
gnu/packages/serialization.scm | 2 +-
gnu/packages/shells.scm | 2 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/textutils.scm | 2 +-
gnu/packages/version-control.scm | 40 ++++-
gnu/packages/video.scm | 8 +-
gnu/packages/wm.scm | 4 +-
gnu/services/desktop.scm | 53 +++++-
guix/build/emacs-build-system.scm | 2 +-
guix/gnu-maintenance.scm | 67 ++++++-
guix/memoization.scm | 5 +-
60 files changed, 826 insertions(+), 504 deletions(-)