[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: |
Fri, 26 Jan 2018 00:18:14 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit b89d8a4271c8ef02c9b1e51a2c86341cdc09c760
Merge: 7bf0170 a81f7eb
Author: Mark H Weaver <address@hidden>
Date: Fri Jan 26 00:15:26 2018 -0500
Merge branch 'master' into core-updates
gnu/local.mk | 2 +
gnu/packages/audio.scm | 52 ++++++++
gnu/packages/avahi.scm | 36 ++----
gnu/packages/bioinformatics.scm | 8 +-
gnu/packages/cobol.scm | 24 +++-
gnu/packages/conky.scm | 19 +--
gnu/packages/databases.scm | 4 +-
gnu/packages/datastructures.scm | 4 +-
gnu/packages/dc.scm | 7 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/elf.scm | 9 +-
gnu/packages/emacs.scm | 137 ++++++++++++++++++++
gnu/packages/gcc.scm | 6 +-
gnu/packages/glib.scm | 30 +++--
gnu/packages/iso-codes.scm | 43 +++++++
gnu/packages/linux.scm | 20 ++-
gnu/packages/mail.scm | 1 +
gnu/packages/music.scm | 2 +-
gnu/packages/package-management.scm | 67 ++++++++++
gnu/packages/patches/dovecot-CVE-2017-15132.patch | 36 ++++++
.../reposurgeon-add-missing-docbook-files.patch | 22 ++++
gnu/packages/perl.scm | 4 +-
gnu/packages/python-crypto.scm | 43 +++++++
gnu/packages/qt.scm | 141 ++++++++++-----------
gnu/packages/version-control.scm | 50 ++++++--
gnu/packages/video.scm | 31 +++++
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 6 +-
gnu/services/databases.scm | 40 +++---
guix/build/dub-build-system.scm | 9 +-
30 files changed, 676 insertions(+), 185 deletions(-)
diff --cc gnu/local.mk
index 0d18cec,80d6a8d..9df027a
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -609,10 -607,9 +609,11 @@@ dist_patch_DATA =
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
+ %D%/packages/patches/diffutils-getopt.patch \
+ %D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
+ %D%/packages/patches/dovecot-CVE-2017-15132.patch \
%D%/packages/patches/doxygen-test.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/eigen-arm-neon-fixes.patch \
diff --cc gnu/packages/gcc.scm
index b1fc32b,48e7b8e..2c7650d
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@@ -1,9 -1,9 +1,9 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès
<address@hidden>
- ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015 Andreas Enge <address@hidden>
-;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
;;;
;;; This file is part of GNU Guix.