[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Tue, 25 Apr 2017 14:29:27 -0400 (EDT) |
lfam pushed a commit to branch staging
in repository guix.
commit 39d2d9a7abdde28830c39c1128986cad539c081d
Merge: 8030679 31c374e
Author: Leo Famulari <address@hidden>
Date: Tue Apr 25 14:27:03 2017 -0400
Merge branch 'master' into staging
etc/guix-daemon.service.in | 4 +-
gnu/local.mk | 3 +
gnu/packages/aspell.scm | 9 +-
gnu/packages/base.scm | 9 +-
gnu/packages/bioinformatics.scm | 15 ++-
gnu/packages/databases.scm | 2 +-
gnu/packages/emacs.scm | 19 +++
gnu/packages/fonts.scm | 59 ++++++++-
gnu/packages/gnome.scm | 14 ++
gnu/packages/gnustep.scm | 5 +-
gnu/packages/gnuzilla.scm | 10 ++
gnu/packages/guile.scm | 6 +-
gnu/packages/libevent.scm | 7 +-
gnu/packages/linux.scm | 21 ++-
gnu/packages/networking.scm | 4 +-
gnu/packages/patches/libcroco-CVE-2017-7960.patch | 66 ++++++++++
gnu/packages/patches/libcroco-CVE-2017-7961.patch | 50 +++++++
.../wmfire-update-for-new-gdk-versions.patch | 144 +++++++++++++++++++++
gnu/packages/screen.scm | 6 +-
gnu/packages/sdl.scm | 17 ++-
gnu/packages/statistics.scm | 20 +--
gnu/packages/video.scm | 25 ++--
22 files changed, 457 insertions(+), 58 deletions(-)