[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: |
Tue, 16 Jun 2015 05:02:11 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 7d02724b7bddb4d5e1cc93db99f737baa26840ca
Merge: 4c10c6c fef3cfa
Author: Mark H Weaver <address@hidden>
Date: Tue Jun 16 01:01:54 2015 -0400
Merge branch 'master' into core-updates
doc/guix.texi | 2 +-
gnu-system.am | 14 +-
gnu/packages/audio.scm | 6 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/emacs.scm | 64 +++++
gnu/packages/patches/qemu-CVE-2015-4037.patch | 53 ++++
gnu/packages/patches/qemu-CVE-2015-4103.patch | 135 +++++++++
gnu/packages/patches/qemu-CVE-2015-4104.patch | 189 +++++++++++++
gnu/packages/patches/qemu-CVE-2015-4105.patch | 85 ++++++
gnu/packages/patches/qemu-CVE-2015-4106-pt1.patch | 72 +++++
gnu/packages/patches/qemu-CVE-2015-4106-pt2.patch | 81 ++++++
gnu/packages/patches/qemu-CVE-2015-4106-pt3.patch | 33 +++
gnu/packages/patches/qemu-CVE-2015-4106-pt4.patch | 260 ++++++++++++++++++
gnu/packages/patches/qemu-CVE-2015-4106-pt5.patch | 33 +++
gnu/packages/patches/qemu-CVE-2015-4106-pt6.patch | 89 ++++++
gnu/packages/patches/qemu-CVE-2015-4106-pt7.patch | 72 +++++
gnu/packages/patches/qemu-CVE-2015-4106-pt8.patch | 132 +++++++++
gnu/packages/python.scm | 94 ++++---
gnu/packages/qemu.scm | 14 +-
gnu/packages/ruby.scm | 300 +++++++++++++++++++++
gnu/packages/screen.scm | 4 +-
gnu/packages/{dwm.scm => suckless.scm} | 62 ++++-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 5 +-
gnu/services/desktop.scm | 2 -
25 files changed, 1743 insertions(+), 68 deletions(-)