[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into security-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into security-updates |
|
Date: |
Tue, 09 Feb 2016 01:08:32 +0000 |
mhw pushed a commit to branch security-updates
in repository guix.
commit 2385799f42ff467a7889108d9f8efaaba179e54f
Merge: 492f93a 939c5c3
Author: Mark H Weaver <address@hidden>
Date: Mon Feb 8 20:07:06 2016 -0500
Merge branch 'master' into security-updates
Makefile.am | 1 +
doc/emacs.texi | 24 +++-
doc/guix.texi | 6 +-
emacs/guix-backend.el | 23 +++-
emacs/guix-emacs.el | 93 +++++------
gnu-system.am | 2 +
gnu/build/file-systems.scm | 6 +-
gnu/packages/curl.scm | 2 +-
gnu/packages/emacs.scm | 3 +-
gnu/packages/glib.scm | 12 +-
gnu/packages/gnome.scm | 52 ++++++-
gnu/packages/gnupg.scm | 49 +++++-
gnu/packages/gtk.scm | 7 +-
gnu/packages/guile.scm | 13 ++-
gnu/packages/libcanberra.scm | 8 +
gnu/packages/lisp.scm | 48 ++++++
gnu/packages/password-utils.scm | 64 +++++++-
.../pygpgme-disable-problematic-tests.patch | 37 +++++
gnu/packages/patches/xdotool-fix-makefile.patch | 16 ++
gnu/packages/python.scm | 118 ++++++++------
gnu/packages/texinfo.scm | 14 ++-
gnu/packages/xdisorg.scm | 14 +-
gnu/services.scm | 1 +
gnu/services/base.scm | 1 +
gnu/system.scm | 8 +-
gnu/system/linux-container.scm | 4 +-
gnu/system/linux-initrd.scm | 4 +-
gnu/system/vm.scm | 1 +
guix/build-system/python.scm | 70 ++++++---
guix/build/bournish.scm | 172 ++++++++++++++++++++
30 files changed, 705 insertions(+), 168 deletions(-)