[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 24 Jan 2018 06:29:37 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit a102d359a68ce7219a1880e47dd6f9332cbbce3a
Merge: 07b8ea8 f3a13a2
Author: Mark H Weaver <address@hidden>
Date: Tue Jan 23 17:01:07 2018 -0500
Merge branch 'master' into core-updates
Makefile.am | 20 +-
configure.ac | 3 +-
doc/guix.texi | 21 +-
gnu/bootloader/u-boot.scm | 44 +-
gnu/local.mk | 3 +
gnu/packages/admin.scm | 8 +-
gnu/packages/android.scm | 66 ++-
gnu/packages/autotools.scm | 36 ++
gnu/packages/bioinformatics.scm | 472 ++++++++++++++++++++-
gnu/packages/bittorrent.scm | 30 +-
gnu/packages/bootloaders.scm | 31 +-
gnu/packages/certs.scm | 6 +-
gnu/packages/code.scm | 53 ++-
gnu/packages/compression.scm | 9 +-
gnu/packages/cpp.scm | 6 +-
gnu/packages/cran.scm | 21 +
gnu/packages/cross-base.scm | 4 +-
gnu/packages/django.scm | 23 +
gnu/packages/emacs.scm | 19 +-
gnu/packages/finance.scm | 32 ++
gnu/packages/game-development.scm | 8 +-
gnu/packages/geo.scm | 10 +-
gnu/packages/gimp.scm | 28 +-
gnu/packages/gnunet.scm | 10 +-
gnu/packages/golang.scm | 20 +-
gnu/packages/graphics.scm | 88 ++++
gnu/packages/image-processing.scm | 5 +-
gnu/packages/imagemagick.scm | 5 +-
gnu/packages/linux.scm | 8 +-
gnu/packages/monitoring.scm | 107 ++++-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 32 +-
gnu/packages/orpheus.scm | 20 +-
gnu/packages/package-management.scm | 6 +-
gnu/packages/parallel.scm | 12 +-
.../patches/libsndfile-CVE-2017-12562.patch | 97 +++++
gnu/packages/patches/rct-add-missing-headers.patch | 43 ++
gnu/packages/patches/rtags-separate-rct.patch | 72 ++++
gnu/packages/pulseaudio.scm | 10 +
gnu/packages/python.scm | 151 +++++--
gnu/packages/shells.scm | 48 ++-
gnu/packages/shellutils.scm | 15 +-
gnu/packages/slang.scm | 10 +-
gnu/packages/spice.scm | 9 +-
gnu/packages/statistics.scm | 27 +-
gnu/packages/tryton.scm | 128 +++++-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 13 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wxwidgets.scm | 5 +-
gnu/packages/xml.scm | 8 +-
gnu/services.scm | 59 ++-
gnu/services/herd.scm | 9 +-
gnu/services/shepherd.scm | 36 +-
gnu/services/version-control.scm | 6 +-
gnu/system.scm | 7 +-
gnu/system/examples/desktop.tmpl | 4 +-
gnu/system/examples/lightweight-desktop.tmpl | 2 +-
gnu/system/install.scm | 75 +++-
gnu/tests/version-control.scm | 25 +-
guix/scripts/publish.scm | 16 +-
guix/scripts/system.scm | 6 +-
scripts/guix.in | 80 ++--
tests/publish.scm | 16 +
tests/services.scm | 32 +-
66 files changed, 1929 insertions(+), 364 deletions(-)
diff --cc gnu/packages/emacs.scm
index c981200,0c3d513..4464376
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -1,10 -1,10 +1,10 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <address@hidden>
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <address@hidden>
;;; Copyright © 2015 Federico Beffa <address@hidden>
- ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016, 2017 Chris Marusich <address@hidden>
;;; Copyright © 2015, 2016 Christopher Allan Webber <address@hidden>
;;; Copyright © 2016 Adriano Peluso <address@hidden>