[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 17 Jun 2016 13:49:33 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit c0eeccbc2486572de1ef88249c63bc71c28dfef6
Merge: 56501d3 a1b4846
Author: Ludovic Courtès <address@hidden>
Date: Fri Jun 17 15:48:27 2016 +0200
Merge branch 'master' into core-updates
Makefile.am | 2 +
doc/guix.texi | 70 ++++-
gnu/local.mk | 7 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/bioinformatics.scm | 179 ++++++++----
gnu/packages/databases.scm | 10 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/emacs.scm | 43 +++
gnu/packages/engineering.scm | 1 +
gnu/packages/enlightenment.scm | 13 +-
gnu/packages/finance.scm | 9 +-
gnu/packages/flashing-tools.scm | 51 ++++
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/games.scm | 58 ++++
gnu/packages/geo.scm | 94 ++++++
gnu/packages/glib.scm | 4 +
gnu/packages/gnome.scm | 108 ++++++-
gnu/packages/gnupg.scm | 6 +-
gnu/packages/gps.scm | 3 +-
gnu/packages/grue-hunter.scm | 84 ------
gnu/packages/julia.scm | 62 +++-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/logging.scm | 47 +++
gnu/packages/lsh.scm | 10 +-
gnu/packages/lxqt.scm | 46 +--
gnu/packages/mail.scm | 4 +-
gnu/packages/music.scm | 13 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/parallel.scm | 6 +-
.../patches/awesome-reproducible-png.patch | 14 +
gnu/packages/patches/openssl-CVE-2016-2177.patch | 286 +++++++++++++++++++
gnu/packages/patches/openssl-CVE-2016-2178.patch | 112 ++++++++
gnu/packages/patches/teensy-loader-cli-help.patch | 33 +++
gnu/packages/perl.scm | 19 +-
gnu/packages/photo.scm | 7 +-
gnu/packages/plotutils.scm | 4 +-
gnu/packages/popt.scm | 30 +-
gnu/packages/pumpio.scm | 2 +-
gnu/packages/python.scm | 129 ++++++++-
gnu/packages/qt.scm | 301 ++++++++++++++++++++
gnu/packages/scribus.scm | 5 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/video.scm | 123 ++++----
gnu/packages/web.scm | 4 +-
gnu/packages/wget.scm | 4 +-
gnu/packages/wm.scm | 96 +++++++
gnu/packages/xml.scm | 17 +-
gnu/services/databases.scm | 119 +++++++-
gnu/services/dict.scm | 24 +-
guix/build/hg.scm | 51 ++++
guix/build/syscalls.scm | 31 +-
guix/gexp.scm | 33 +--
guix/hg-download.scm | 84 ++++++
guix/import/pypi.scm | 113 ++++++--
guix/packages.scm | 40 +--
guix/store.scm | 60 ++--
guix/utils.scm | 27 +-
tests/gexp.scm | 27 +-
tests/packages.scm | 15 +
tests/pypi.scm | 78 ++++-
61 files changed, 2430 insertions(+), 418 deletions(-)
diff --cc gnu/packages/tls.scm
index d3ab981,0add9ef..74cbb16
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -193,23 -208,15 +193,25 @@@ required structures."
"/" name "-" version ".tar.gz")))
(sha256
(base32
- "0cxajjayi859czi545ddafi24m9nwsnjsw4q82zrmqvwj2rv315p"))
+ "06996ds1rk8xhnyb5y273a7xkcxhggp4bq1g02rab55d7bjhfh0x"))
(patches (search-patches "openssl-runpath.patch"
-- "openssl-c-rehash-in.patch"))))
++ "openssl-c-rehash-in.patch"
++ "openssl-CVE-2016-2177.patch"
++ "openssl-CVE-2016-2178.patch"))))
(build-system gnu-build-system)
+ (outputs '("out"
+ "doc" ;1.5MiB of man3 pages
+ "static")) ;6MiB of .a files
(native-inputs `(("perl" ,perl)))
(arguments
- `(#:parallel-build? #f
+ `(#:disallowed-references (,perl)
+ #:parallel-build? #f
#:parallel-tests? #f
#:test-target "test"
+
+ ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure,
+ ;; so we explicitly disallow it here.
+ #:disallowed-references ,(list (canonical-package perl))
#:phases
(modify-phases %standard-phases
(add-before
diff --cc gnu/packages/xml.scm
index e2d031d,81a71bd..ef7f257
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -4,10 -4,9 +4,10 @@@
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
;;; Copyright © 2015, 2016 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
- ;;; Copyright © 2015 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2015 Raimon Grau <address@hidden>
+;;; Copyright © 2016 Mathieu Lirzin <address@hidden>
;;; Copyright © 2016 Leo Famulari <address@hidden>
;;;
;;; This file is part of GNU Guix.