[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Mon, 27 Mar 2017 21:32:04 -0400 (EDT) |
lfam pushed a commit to branch core-updates
in repository guix.
commit c17383f400d3b942c22ec46b556cad8ca3a2fce1
Merge: b1a8fd2 7aeb4ff
Author: Leo Famulari <address@hidden>
Date: Mon Mar 27 21:19:38 2017 -0400
Merge branch 'master' into core-updates
HACKING | 11 +-
Makefile.am | 12 +-
doc/guix.texi | 731 ++++++++++++++++++++--
gnu/local.mk | 4 +
gnu/packages/audacity.scm | 4 +-
gnu/packages/ccache.scm | 6 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs.scm | 79 +++
gnu/packages/game-development.scm | 45 +-
gnu/packages/gnome.scm | 8 +-
gnu/packages/guile.scm | 2 +-
gnu/packages/haskell.scm | 61 ++
gnu/packages/linux.scm | 19 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 4 +-
gnu/packages/music.scm | 6 +-
gnu/packages/patches/libgit2-use-after-free.patch | 24 +
gnu/packages/perl.scm | 165 +++--
gnu/packages/python.scm | 15 +-
gnu/packages/rust.scm | 7 +-
gnu/packages/samba.scm | 19 +-
gnu/packages/ssh.scm | 29 +-
gnu/packages/version-control.scm | 20 +-
gnu/packages/video.scm | 4 +-
gnu/packages/web.scm | 4 +-
gnu/packages/webkit.scm | 8 +-
gnu/packages/xdisorg.scm | 6 +-
gnu/services/base.scm | 16 +-
gnu/services/configuration.scm | 29 +-
gnu/services/messaging.scm | 23 +-
gnu/services/networking.scm | 89 +++
gnu/services/pm.scm | 404 ++++++++++++
gnu/services/vpn.scm | 3 +-
gnu/system/grub.scm | 6 +-
gnu/tests/networking.scm | 149 +++++
guix/build/union.scm | 17 +-
guix/profiles.scm | 61 +-
guix/scripts/lint.scm | 22 +-
guix/ui.scm | 17 +-
tests/lint.scm | 8 +
tests/union.scm | 22 +-
41 files changed, 1915 insertions(+), 252 deletions(-)
diff --cc gnu/local.mk
index 02758dd,cc187e2..f69946b
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -9,9 -9,8 +9,10 @@@
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
# Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
# Copyright © 2016 Ben Woodcroft <address@hidden>
+# Copyright © 2016, 2017 Alex Vong <address@hidden>
+# Copyright © 2016, 2017 Efraim Flashner <address@hidden>
# Copyright © 2017 Clément Lassieur <address@hidden>
+ # Copyright © 2017 Mathieu Othacehe <address@hidden>
#
# This file is part of GNU Guix.
#
diff --cc gnu/packages/game-development.scm
index 29f0555,9919114..b4fce3f
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@@ -3,8 -3,8 +3,8 @@@
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 Alex Kost <address@hidden>
- ;;; Copyright © 2015, 2016 David Thompson <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017 David Thompson <address@hidden>
-;;; Copyright © 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016, 2017 Kei Kebreau <address@hidden>
;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016 Julian Graham <address@hidden>