[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: |
Tue, 13 Feb 2018 13:20:22 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 288b8fd5e97c32d44a49612dbeef854c05ebc373
Merge: a7fb298 acff6aa
Author: Mark H Weaver <address@hidden>
Date: Tue Feb 13 13:17:15 2018 -0500
Merge branch 'master' into core-updates
.mailmap | 23 +-
gnu/local.mk | 3 -
gnu/packages/bioinformatics.scm | 311 +++-
gnu/packages/ccache.scm | 10 +-
gnu/packages/check.scm | 17 +
gnu/packages/compression.scm | 17 +-
gnu/packages/cran.scm | 143 +-
gnu/packages/crypto.scm | 14 +-
gnu/packages/emacs.scm | 9 +-
gnu/packages/embedded.scm | 5 +-
gnu/packages/golang.scm | 4 +-
gnu/packages/haskell-check.scm | 145 +-
gnu/packages/haskell-crypto.scm | 22 +-
gnu/packages/haskell-web.scm | 93 +-
gnu/packages/haskell.scm | 1388 +++++++++++++-----
gnu/packages/kde-frameworks.scm | 51 +
gnu/packages/libcanberra.scm | 6 +-
gnu/packages/libreoffice.scm | 70 +-
gnu/packages/libusb.scm | 4 +-
gnu/packages/linux.scm | 18 +-
gnu/packages/maths.scm | 10 +-
gnu/packages/patches/mpv-CVE-2018-6360-1.patch | 138 --
gnu/packages/patches/mpv-CVE-2018-6360-2.patch | 59 -
gnu/packages/patches/mpv-CVE-2018-6360-3.patch | 84 --
gnu/packages/statistics.scm | 194 +--
gnu/packages/version-control.scm | 12 +-
gnu/packages/video.scm | 9 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/w3m.scm | 6 +-
gnu/packages/web.scm | 57 +-
gnu/packages/xml.scm | 123 +-
po/guix/zh_CN.po | 1860 +++++++++++++++++-------
32 files changed, 3415 insertions(+), 1494 deletions(-)
diff --cc gnu/packages/haskell.scm
index 5db0c79,2fc0559..b595005
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@@ -3,10 -3,10 +3,10 @@@
;;; Copyright © 2015 Siniša Biđin <address@hidden>
;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
-;;; Copyright © 2016 Ludovic Courtès <address@hidden>
+;;; Copyright © 2016, 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2016, 2017 ng0 <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
- ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016, 2017 David Craven <address@hidden>
;;; Copyright © 2017 Danny Milosavljevic <address@hidden>
;;; Copyright © 2017 Peter Mikkelsen <address@hidden>
diff --cc gnu/packages/libreoffice.scm
index 3c04ba8,47dd21b..9b60c06
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@@ -944,14 -931,8 +931,14 @@@ and to return information on pronunciat
(modify-phases %standard-phases
(add-before 'configure 'prepare-src
(lambda* (#:key inputs #:allow-other-keys)
- (let ((xmlsec (assoc-ref inputs "xmlsec-src")))
+ (let ((gpgme (assoc-ref inputs "gpgme")))
(substitute*
+ "sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx"
+ ;; This header was renamed in Poppler 0.62.0.
+ (("UTF8.h") "UnicodeMapFuncs.h")
+ ;; And mapUCS2() was renamed to mapUTF16().
+ (("UCS2") "UTF16"))
+ (substitute*
(list "sysui/CustomTarget_share.mk"
"solenv/gbuild/gbuild.mk"
"solenv/gbuild/platform/unxgcc.mk")
diff --cc gnu/packages/xml.scm
index 12a68ab,919043a..055bf8d
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -3,9 -3,9 +3,9 @@@
;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
- ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015, 2016, 2017 Mark H Weaver <address@hidden>
-;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2015 Raimon Grau <address@hidden>
;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>