[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 29 Jul 2016 18:19:00 +0000 (UTC) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 0bab3af0786ffd4caec05a29d7281ac5e5c18b6b
Merge: 49d725a 682a7d2
Author: Mark H Weaver <address@hidden>
Date: Fri Jul 29 14:18:07 2016 -0400
Merge branch 'master' into core-updates
configure.ac | 2 +-
gnu/local.mk | 8 +-
gnu/packages/bison.scm | 6 +-
gnu/packages/databases.scm | 3 +-
gnu/packages/education.scm | 69 ++++++
gnu/packages/emacs.scm | 2 +-
gnu/packages/flex.scm | 6 +-
gnu/packages/freedesktop.scm | 10 +
gnu/packages/gd.scm | 10 +-
gnu/packages/gnunet.scm | 14 +-
gnu/packages/gnustep.scm | 2 +-
gnu/packages/haskell.scm | 2 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/linux.scm | 6 +-
gnu/packages/marst.scm | 9 +-
gnu/packages/maths.scm | 9 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/openstack.scm | 2 +-
gnu/packages/package-management.scm | 1 +
gnu/packages/password-utils.scm | 38 +--
gnu/packages/patches/gd-CVE-2016-5766.patch | 81 -------
gnu/packages/patches/gd-CVE-2016-6128.patch | 253 -------------------
gnu/packages/patches/gd-CVE-2016-6132.patch | 55 -----
gnu/packages/patches/gd-CVE-2016-6214.patch | 66 -----
gnu/packages/patches/gd-fix-test-on-i686.patch | 34 ---
gnu/packages/patches/gd-fix-tests-on-i686.patch | 66 +++++
gnu/packages/perl.scm | 6 +-
gnu/packages/pulseaudio.scm | 11 +-
gnu/packages/python.scm | 10 +-
gnu/packages/qemu.scm | 30 +--
gnu/packages/ruby.scm | 3 +-
gnu/packages/sdl.scm | 26 +-
gnu/packages/search.scm | 3 +-
gnu/packages/skarnet.scm | 122 +++++++++-
gnu/packages/spice.scm | 297 +++++++++++++++++++++++
gnu/packages/ssh.scm | 21 ++
gnu/packages/swig.scm | 7 +-
gnu/packages/xorg.scm | 36 ++-
tests/guix-register.sh | 18 +-
39 files changed, 730 insertions(+), 618 deletions(-)