[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: |
Mon, 25 Jan 2016 02:05:26 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 412bee5e2931a53066ae593808935608d54a4345
Merge: 6871628 880d647
Author: Mark H Weaver <address@hidden>
Date: Sun Jan 24 21:04:54 2016 -0500
Merge branch 'master' into core-updates
Makefile.am | 4 +-
build-aux/hydra/gnu-system.scm | 5 +-
doc/guix.texi | 143 +++++++++++--
gnu-system.am | 6 +-
gnu/build/linux-container.scm | 2 +-
gnu/packages/admin.scm | 27 ++-
gnu/packages/algebra.scm | 5 +-
gnu/packages/audio.scm | 6 +-
gnu/packages/bioinformatics.scm | 230 ++++++++++++++++++--
gnu/packages/bittorrent.scm | 44 ++++
gnu/packages/debug.scm | 18 +-
gnu/packages/dns.scm | 36 ++--
gnu/packages/ebook.scm | 4 +-
gnu/packages/enlightenment.scm | 6 +-
gnu/packages/grue-hunter.scm | 2 +-
gnu/packages/lego.scm | 67 ++++++
gnu/packages/linux.scm | 12 +-
gnu/packages/mail.scm | 35 +++-
gnu/packages/messaging.scm | 15 +-
gnu/packages/music.scm | 50 ++++-
gnu/packages/nano.scm | 6 +-
gnu/packages/patches/arb-ldconfig.patch | 22 ++
.../patches/linux-libre-CVE-2016-0728.patch | 84 +++++++
.../patches/tophat-build-with-later-seqan.patch | 24 ++
gnu/packages/tls.scm | 8 +-
gnu/packages/tor.scm | 9 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 36 +++-
gnu/packages/xiph.scm | 14 +-
gnu/services/avahi.scm | 5 +-
gnu/system.scm | 26 ++-
gnu/system/grub.scm | 54 ++++--
guix/import/cran.scm | 103 +++++++--
guix/import/gem.scm | 7 +-
guix/licenses.scm | 8 +-
guix/scripts/build.scm | 10 +-
guix/scripts/import/cran.scm | 9 +-
guix/scripts/refresh.scm | 1 +
tests/cran.scm | 12 +-
tests/derivations.scm | 27 +++
tests/gem.scm | 2 +-
tests/import-utils.scm | 39 ++++
tests/lint.scm | 5 +-
tests/publish.scm | 4 +
tests/system.scm | 77 +++++++
45 files changed, 1143 insertions(+), 172 deletions(-)
diff --cc gnu-system.am
index d37775d,3426056..297f40a
--- a/gnu-system.am
+++ b/gnu-system.am
@@@ -1,6 -1,6 +1,6 @@@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
- # Copyright © 2013, 2014, 2015 Andreas Enge <address@hidden>
+ # Copyright © 2013, 2014, 2015, 2016 Andreas Enge <address@hidden>
# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <address@hidden>
#
# This file is part of GNU Guix.