[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: |
Sun, 31 Jan 2016 23:14:42 +0000 |
mhw pushed a commit to branch security-updates
in repository guix.
commit f809cc83231970565e712747f9853a1695cf2953
Merge: f6d49e2 2a068ae
Author: Mark H Weaver <address@hidden>
Date: Sun Jan 31 18:12:28 2016 -0500
Merge branch 'master' into security-updates
.gitignore | 158 +++++++++-----------
Makefile.am | 35 ++++-
ROADMAP | 2 +-
build-aux/download.scm | 2 +-
build-aux/hydra/demo-os.scm | 2 +-
daemon.am | 11 +-
doc.am | 105 +++++++------
doc/emacs.texi | 2 +-
doc/guix.texi | 167 ++++++++++++---------
doc/images/service-graph.dot | 14 +-
doc/images/{dmd-graph.dot => shepherd-graph.dot} | 2 +-
emacs.am | 13 +-
emacs/guix-command.el | 4 +-
gnu-system.am | 24 ++--
gnu/build/install.scm | 2 +-
gnu/build/linux-boot.scm | 8 +-
gnu/packages/emacs.scm | 53 +++++--
gnu/packages/freedesktop.scm | 2 +-
gnu/packages/game-development.scm | 114 ++++++++++++++-
gnu/packages/gnome.scm | 39 +++++
gnu/packages/package-management.scm | 4 +-
gnu/packages/patches/perl-tk-x11-discover.patch | 14 --
gnu/packages/pumpio.scm | 6 +-
gnu/packages/tcl.scm | 6 +-
gnu/packages/video.scm | 10 +-
gnu/packages/weechat.scm | 4 +-
gnu/services.scm | 6 +-
gnu/services/avahi.scm | 12 +-
gnu/services/base.scm | 139 +++++++++---------
gnu/services/databases.scm | 10 +-
gnu/services/dbus.scm | 10 +-
gnu/services/desktop.scm | 22 ++--
gnu/services/lirc.scm | 10 +-
gnu/services/mail.scm | 12 +-
gnu/services/networking.scm | 56 ++++----
gnu/services/{dmd.scm => shepherd.scm} | 175 +++++++++++-----------
gnu/services/ssh.scm | 12 +-
gnu/services/web.scm | 10 +-
gnu/services/xorg.scm | 24 ++--
gnu/system.scm | 12 +-
gnu/system/install.scm | 6 +-
guix/import/cabal.scm | 2 +-
guix/import/elpa.scm | 2 +-
guix/licenses.scm | 6 +
guix/packages.scm | 2 +-
guix/scripts/lint.scm | 34 ++---
guix/scripts/system.scm | 50 +++---
po/guix/POTFILES.in | 2 +-
tests/guix-system.sh | 8 +-
tests/lint.scm | 12 +-
tests/packages.scm | 4 +-
tests/services.scm | 16 ++-
52 files changed, 832 insertions(+), 625 deletions(-)