[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: |
Sun, 19 Mar 2017 18:55:52 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit f67337e23ec16b1e05fcdcc7953f68f13ed6770a
Merge: b99eec8 e05fc44
Author: Mark H Weaver <address@hidden>
Date: Sun Mar 19 18:52:01 2017 -0400
Merge branch 'master' into core-updates
Makefile.am | 2 +
README | 2 +-
build-aux/download.scm | 9 +-
configure.ac | 2 +-
doc/guix.texi | 141 ++++--
gnu/local.mk | 8 +-
gnu/packages/apl.scm | 7 +-
gnu/packages/bioinformatics.scm | 252 ++++++---
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/datastructures.scm | 26 +-
gnu/packages/dns.scm | 93 +++-
gnu/packages/documentation.scm | 9 +
gnu/packages/emacs.scm | 6 +-
gnu/packages/gnuzilla.scm | 8 +-
gnu/packages/guile.scm | 73 +--
gnu/packages/hurd.scm | 34 +-
gnu/packages/image.scm | 100 +++-
gnu/packages/irc.scm | 4 +-
gnu/packages/libevent.scm | 28 +-
gnu/packages/linux.scm | 22 +-
gnu/packages/machine-learning.scm | 56 +-
gnu/packages/maths.scm | 81 ++-
gnu/packages/ninja.scm | 7 +-
gnu/packages/ocaml.scm | 58 ++-
gnu/packages/package-management.scm | 7 +-
gnu/packages/password-utils.scm | 4 +-
...vent-2.0-evbuffer-add-use-last-with-datap.patch | 38 ++
gnu/packages/patches/libwebp-CVE-2016-9085.patch | 144 ------
gnu/packages/patches/ninja-tests.patch | 48 --
.../patches/password-store-gnupg-compat.patch | 53 ++
gnu/packages/patches/qemu-CVE-2017-2620.patch | 134 +++++
gnu/packages/patches/qemu-CVE-2017-2630.patch | 47 ++
.../patches/virglrenderer-CVE-2017-6386.patch | 54 ++
gnu/packages/pdf.scm | 30 ++
gnu/packages/python.scm | 7 +-
gnu/packages/qemu.scm | 2 +
gnu/packages/rust.scm | 532 ++++++++++++++++++-
gnu/packages/skribilo.scm | 4 +-
gnu/packages/spice.scm | 1 +
gnu/packages/statistics.scm | 562 ++++++++++++++++-----
gnu/packages/tls.scm | 2 +-
gnu/packages/video.scm | 12 +-
gnu/packages/wine.scm | 4 +-
gnu/services/base.scm | 16 +-
gnu/services/networking.scm | 86 ++--
gnu/system/file-systems.scm | 26 +
gnu/system/linux-initrd.scm | 18 +-
guix/base16.scm | 83 +++
guix/build-system/cargo.scm | 3 +-
guix/build-system/r.scm | 2 +-
guix/build/cargo-build-system.scm | 116 ++++-
guix/build/download.scm | 32 +-
guix/derivations.scm | 1 +
guix/docker.scm | 154 ++++--
guix/gexp.scm | 40 +-
guix/http-client.scm | 25 +-
guix/import/cran.scm | 18 +-
guix/import/snix.scm | 3 +-
guix/memoization.scm | 21 +-
guix/pk-crypto.scm | 6 +-
guix/profiles.scm | 10 +-
guix/scripts/archive.scm | 31 +-
guix/scripts/authenticate.scm | 4 +-
guix/scripts/download.scm | 4 +-
guix/scripts/hash.scm | 2 +-
guix/scripts/lint.scm | 6 +-
guix/scripts/pack.scm | 151 +++++-
guix/scripts/substitute.scm | 23 +-
guix/serialization.scm | 3 +-
guix/store.scm | 1 +
guix/utils.scm | 65 +--
tests/base16.scm | 34 ++
tests/gexp.scm | 39 ++
tests/guix-build.sh | 4 +-
tests/hash.scm | 2 +-
tests/nar.scm | 12 +-
tests/pack.scm | 3 +-
tests/pk-crypto.scm | 3 +-
tests/profiles.scm | 31 +-
tests/utils.scm | 9 +-
80 files changed, 2834 insertions(+), 970 deletions(-)
diff --cc build-aux/download.scm
index e0b40e6,18b820a..0e98bef
--- a/build-aux/download.scm
+++ b/build-aux/download.scm
@@@ -1,7 -1,6 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
- ;;; Copyright © 2012, 2013 Ludovic Courtès <address@hidden>
+ ;;; Copyright © 2012, 2013, 2017 Ludovic Courtès <address@hidden>
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2017 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/local.mk
index 9fc5953,885c113..c92a5d0
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -9,8 -9,7 +9,9 @@@
# Copyright © 2016 Adonay "adfeno" Felipe Nogueira
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
# Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
# Copyright © 2016 Ben Woodcroft <address@hidden>
+# Copyright © 2016, 2017 Alex Vong <address@hidden>
+# Copyright © 2016, 2017 Efraim Flashner <address@hidden>
+ # Copyright © 2017 Clément Lassieur <address@hidden>
#
# This file is part of GNU Guix.
#
@@@ -676,10 -675,12 +677,11 @@@ dist_patch_DATA =
%D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
%D%/packages/patches/libcmis-fix-test-onedrive.patch \
%D%/packages/patches/libdrm-symbol-check.patch \
- %D%/packages/patches/libepoxy-gl-null-checks.patch \
%D%/packages/patches/libevent-dns-tests.patch \
+ %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch \
+ %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch \
+ %D%/packages/patches/libevent-2.0-CVE-2016-10197.patch \
+ %D%/packages/patches/libevent-2.0-evbuffer-add-use-last-with-datap.patch
\
- %D%/packages/patches/libevent-2.0-evdns-fix-remote-stack-overread.patch
\
- %D%/packages/patches/libevent-2.0-evdns-fix-searching-empty-hostnames.patch
\
- %D%/packages/patches/libevent-2.0-evutil-fix-buffer-overflow.patch \
%D%/packages/patches/libevent-2.1-dns-tests.patch \
%D%/packages/patches/libevent-2.1-skip-failing-test.patch \
%D%/packages/patches/libextractor-ffmpeg-3.patch \
@@@ -779,10 -778,8 +780,9 @@@
%D%/packages/patches/netsurf-longer-test-timeout.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/ngircd-no-dns-in-tests.patch \
- %D%/packages/patches/ninja-tests.patch \
%D%/packages/patches/ninja-zero-mtime.patch \
%D%/packages/patches/node-9077.patch \
+ %D%/packages/patches/nss-increase-test-timeout.patch \
%D%/packages/patches/nss-pkgconfig.patch \
%D%/packages/patches/ntfs-3g-CVE-2017-0358.patch \
%D%/packages/patches/nvi-assume-preserve-path.patch \
diff --cc gnu/packages/guile.scm
index 59de06b,df1f172..b621d82
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -217,9 -218,22 +217,9 @@@ without requiring the source code to b
(properties '((hidden? . #t))) ;people should install 'guile-2.0'
(replacement #f)))
- (define-public guile-next
-(define guile-2.0.13
- (package
- (inherit guile-2.0)
- (version "2.0.13")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.xz"))
- (sha256
- (base32
- "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"))
- (patches (search-patches "guile-repl-server-test.patch"))))))
-
+ (define-public guile-2.2
(package (inherit guile-2.0)
- (name "guile-next")
+ (name "guile")
(version "2.2.0")
(replacement #f)
(source (origin
diff --cc gnu/packages/image.scm
index fd2eefa,2c438a8..2989ea0
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@@ -90,6 -91,64 +91,52 @@@ library. It supports almost all PNG fe
(license license:zlib)
(home-page "http://www.libpng.org/pub/png/libpng.html";)))
-(define libpng/fixed
- (package
- (inherit libpng)
- (source
- (origin
- (inherit (package-source libpng))
- (patches (search-patches "libpng-CVE-2016-10087.patch"))))))
-
+ (define-public libpng-apng
+ (package
+ (inherit libpng)
+ (replacement #f) ;libpng's replacement doesn't apply here
+ (name "libpng-apng")
+ (version (package-version libpng))
- (source
- (origin
- (inherit (package-source libpng))
- (patches (search-patches "libpng-CVE-2016-10087.patch"))))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-apng
+ (lambda* (#:key inputs #:allow-other-keys)
+ (define (apply-patch file)
+ (zero? (system* "patch" "-p1" "--force"
+ "--input" file)))
+ (let ((apng.gz (assoc-ref inputs "apng")))
+ (format #t "Applying APNG patch '~a'...~%"
+ apng.gz)
+ (system (string-append "gunzip < " apng.gz " > the-patch"))
+ (and (apply-patch "the-patch")
+ (for-each apply-patch
+ (find-files "\\.patch"))))
+ #t))
+ (add-before 'configure 'no-checks
+ (lambda _
+ (substitute* "Makefile.in"
+ (("^scripts/symbols.chk") "")
+ (("check: scripts/symbols.chk") ""))
+ #t)))))
+ (inputs
+ `(("apng" ,(origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://sourceforge/libpng-apng/libpng16/"
+ version "/libpng-" version
"-apng.patch.gz"))
+ (sha256
+ (base32
+
"026r0gbkf6d6v54wca02cdxln8sj4m2c1yk62sj2aasv2ki2ffh5"))))))
+ (native-inputs
+ `(("libtool" ,libtool)))
+ (synopsis "APNG patch for libpng")
+ (description
+ "APNG (Animated Portable Network Graphics) is an unofficial
+ extension of the APNG (Portable Network Graphics) format.
+ APNG patch provides APNG support to libpng.")
+ (home-page "https://sourceforge.net/projects/libpng-apng/";)))
+
(define-public libpng-1.2
(package
(inherit libpng)
diff --cc gnu/packages/libevent.scm
index 551fbf7,6e2ce8f..1bfdefd
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@@ -74,18 -74,20 +74,20 @@@ loop."
(inherit libevent)
(version "2.0.22")
(source (origin
- (method url-fetch)
- (uri (string-append
-
"https://github.com/libevent/libevent/releases/download/release-";
- version "-stable/libevent-" version "-stable.tar.gz"))
- (sha256
- (base32
- "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"))
- (patches (search-patches
- "libevent-dns-tests.patch"
- "libevent-2.0-CVE-2016-10195.patch"
- "libevent-2.0-CVE-2016-10196.patch"
- "libevent-2.0-CVE-2016-10197.patch"))))))
+ (method url-fetch)
+ (uri (string-append
+
"https://github.com/libevent/libevent/releases/download/release-";
+ version "-stable/libevent-" version "-stable.tar.gz"))
+ (sha256
+ (base32
+ "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"))
+ (patches
+ (search-patches
+ "libevent-dns-tests.patch"
- "libevent-2.0-evdns-fix-remote-stack-overread.patch"
- "libevent-2.0-evutil-fix-buffer-overflow.patch"
- "libevent-2.0-evdns-fix-searching-empty-hostnames.patch"
++ "libevent-2.0-CVE-2016-10195.patch"
++ "libevent-2.0-CVE-2016-10196.patch"
++ "libevent-2.0-CVE-2016-10197.patch"
+ "libevent-2.0-evbuffer-add-use-last-with-datap.patch"))))))
(define-public libev
(package
diff --cc gnu/packages/tls.scm
index 9796c18,9c7cb0b..2aecc5f
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -219,11 -235,11 +219,11 @@@ required structures."
(name "guile2.2-gnutls")
(arguments
;; Remove '--with-guile-site-dir=…/2.0'.
- (substitute-keyword-arguments (package-arguments gnutls-3.5.8)
+ (substitute-keyword-arguments (package-arguments gnutls)
((#:configure-flags flags)
`(cdr ,flags))))
- (inputs `(("guile" ,guile-next)
+ (inputs `(("guile" ,guile-2.2)
- ,@(alist-delete "guile" (package-inputs gnutls-3.5.8))))))
+ ,@(alist-delete "guile" (package-inputs gnutls))))))
(define-public openssl
(package