[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
02/02: Merge branch 'master' into core-updates |
|
Date: |
Thu, 08 Oct 2015 03:55:33 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 319fe79dd01e03c4ef61311c336bcd77e1133f02
Merge: 9511de1 a606ed8
Author: Mark H Weaver <address@hidden>
Date: Wed Oct 7 23:55:17 2015 -0400
Merge branch 'master' into core-updates
README | 1 -
configure.ac | 31 +++--
doc/guix.texi | 11 ++-
gnu-system.am | 9 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/autotools.scm | 25 ++++
gnu/packages/bioinformatics.scm | 63 ++++++++++
gnu/packages/bittorrent.scm | 24 ++---
gnu/packages/ebook.scm | 4 +-
gnu/packages/emacs.scm | 6 +
gnu/packages/enlightenment.scm | 17 ++--
gnu/packages/feh.scm | 4 +-
gnu/packages/fonts.scm | 58 +++++++++
gnu/packages/gnome.scm | 34 +++++
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gprolog.scm | 9 +-
gnu/packages/graphviz.scm | 20 +++-
gnu/packages/gstreamer.scm | 6 +-
gnu/packages/ibus.scm | 4 +-
gnu/packages/image.scm | 17 ++-
gnu/packages/imagemagick.scm | 3 +-
gnu/packages/linux.scm | 13 +-
gnu/packages/lirc.scm | 8 +-
gnu/packages/lxqt.scm | 110 +++++++++++++++--
gnu/packages/maths.scm | 22 ++--
gnu/packages/mp3.scm | 4 +-
gnu/packages/ocaml.scm | 3 +-
gnu/packages/password-utils.scm | 28 +++++
gnu/packages/patches/freeimage-CVE-2015-0852.patch | 129 ++++++++++++++++++++
gnu/packages/patches/openjpeg-CVE-2015-6581.patch | 47 +++++++
.../patches/openjpeg-use-after-free-fix.patch | 48 +++++++
gnu/packages/patches/qt4-tests.patch | 22 ----
gnu/packages/patches/qt5-runpath.patch | 27 ----
gnu/packages/patches/valgrind-enable-arm.patch | 15 +++
gnu/packages/patches/valgrind-glibc-2.22.patch | 39 ------
.../patches/valgrind-linux-libre-4.x.patch | 18 ---
.../patches/webkitgtk-2.4-sql-init-string.patch | 17 +++
gnu/packages/python.scm | 32 +++++
gnu/packages/qt.scm | 46 +++++---
gnu/packages/ssh.scm | 6 +-
gnu/packages/textutils.scm | 24 ++++
gnu/packages/valgrind.scm | 7 +-
gnu/packages/video.scm | 19 ++--
gnu/packages/web.scm | 42 +++++++
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 11 +-
gnu/packages/xorg.scm | 4 +-
guix/build/download.scm | 9 ++-
guix/config.scm.in | 8 +-
guix/import/pypi.scm | 10 --
guix/import/snix.scm | 14 +-
guix/scripts/publish.scm | 13 ++-
guix/utils.scm | 38 ------
m4/guix.m4 | 15 +++
test-env.in | 5 +-
tests/derivations.scm | 3 +-
tests/snix.scm | 12 +-
57 files changed, 905 insertions(+), 321 deletions(-)