[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, 11 Aug 2017 03:53:45 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 3785e42e5219a86d9d8a5208ff18e97e0cbcbe78
Merge: d156c99 d373c16
Author: Mark H Weaver <address@hidden>
Date: Fri Aug 11 03:49:24 2017 -0400
Merge branch 'master' into core-updates
doc/guix.texi | 25 ++-
gnu/local.mk | 2 -
gnu/packages/check.scm | 4 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/dav.scm | 4 +-
gnu/packages/emacs.scm | 106 +++++++++
gnu/packages/gnome.scm | 4 +-
gnu/packages/gstreamer.scm | 11 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 6 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/logging.scm | 5 +-
.../openjpeg-CVE-2016-9572-CVE-2016-9573.patch | 233 --------------------
.../openjpeg-CVE-2016-9850-CVE-2016-9851.patch | 245 ---------------------
gnu/packages/python.scm | 23 ++
gnu/packages/rails.scm | 4 +-
gnu/packages/ruby.scm | 192 ++++++++--------
gnu/packages/shells.scm | 4 +-
gnu/packages/version-control.scm | 23 +-
gnu/services/admin.scm | 24 +-
20 files changed, 316 insertions(+), 611 deletions(-)