[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: |
Thu, 17 May 2018 01:03:26 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 539bf8f2c071b53834829259bb3fabf0390c5dc6
Merge: 9038743 2cf8531
Author: Mark H Weaver <address@hidden>
Date: Thu May 17 01:00:50 2018 -0400
Merge branch 'master' into core-updates
Makefile.am | 5 +-
NEWS | 5 +
build-aux/hydra/gnu-system.scm | 3 +-
build-aux/test-env.in | 1 +
doc/guix.texi | 124 ++-
gnu/bootloader/extlinux.scm | 1 +
gnu/bootloader/u-boot.scm | 34 +-
gnu/local.mk | 16 +-
gnu/packages.scm | 2 +-
gnu/packages/android.scm | 613 ++++++++---
gnu/packages/aux-files/run-in-namespace.c | 313 ++++++
gnu/packages/bioconductor.scm | 32 +
gnu/packages/bioinformatics.scm | 82 +-
gnu/packages/bootloaders.scm | 41 +-
gnu/packages/commencement.scm | 2 +-
gnu/packages/dunst.scm | 5 +-
gnu/packages/education.scm | 73 +-
gnu/packages/emacs.scm | 85 +-
gnu/packages/emulators.scm | 12 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/games.scm | 5 +-
gnu/packages/gnome.scm | 8 +-
gnu/packages/gnuzilla.scm | 34 +-
gnu/packages/golang.scm | 8 +-
gnu/packages/graphviz.scm | 4 +-
gnu/packages/groovy.scm | 1156 ++++++++++++++++++++
gnu/packages/gstreamer.scm | 1 -
gnu/packages/guile.scm | 111 +-
gnu/packages/haskell-check.scm | 14 +
gnu/packages/haskell.scm | 55 +
gnu/packages/image-processing.scm | 205 ++++
gnu/packages/image-viewers.scm | 40 +-
gnu/packages/imagemagick.scm | 8 +-
gnu/packages/inkscape.scm | 9 +-
gnu/packages/javascript.scm | 39 +
gnu/packages/kde-frameworks.scm | 4 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/linux.scm | 64 +-
gnu/packages/lxde.scm | 4 +-
gnu/packages/maths.scm | 10 +-
gnu/packages/messaging.scm | 14 +-
gnu/packages/mpd.scm | 3 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/package-management.scm | 4 +-
gnu/packages/password-utils.scm | 33 +-
gnu/packages/patches/adb-add-libraries.patch | 30 +
.../groovy-add-exceptionutilsgenerator.patch | 98 ++
...> icecat-CVE-2018-5157-and-CVE-2018-5158.patch} | 0
gnu/packages/patches/libutils-add-includes.patch | 11 +
.../libutils-remove-damaging-includes.patch | 21 +
.../patches/libziparchive-add-includes.patch | 10 +
gnu/packages/patches/mupdf-CVE-2017-17858.patch | 111 --
gnu/packages/patches/mupdf-CVE-2018-1000051.patch | 88 --
gnu/packages/patches/mupdf-CVE-2018-6544.patch | 109 --
.../patches/mupdf-build-with-latest-openjpeg.patch | 27 -
gnu/packages/patches/myrepos-CVE-2018-7032.patch | 69 ++
.../patches/python-statsmodels-fix-tests.patch | 28 -
.../patches/wesnoth-fix-std-bad-cast.patch | 67 --
gnu/packages/pdf.scm | 10 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/printers.scm | 69 ++
gnu/packages/python-crypto.scm | 124 +++
gnu/packages/python-web.scm | 109 ++
gnu/packages/python.scm | 102 +-
gnu/packages/rust.scm | 15 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/statistics.scm | 46 +-
gnu/packages/telephony.scm | 69 ++
gnu/packages/tls.scm | 4 +-
gnu/packages/version-control.scm | 3 +-
gnu/packages/video.scm | 8 +-
gnu/packages/web-browsers.scm | 8 +-
gnu/packages/wine.scm | 10 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xdisorg.scm | 6 +-
gnu/packages/xml.scm | 8 +-
gnu/packages/xorg.scm | 10 +-
gnu/services/desktop.scm | 3 +
gnu/services/games.scm | 2 +-
gnu/services/messaging.scm | 13 +-
gnu/system/install.scm | 20 +-
guix/build-system/android-ndk.scm | 127 +++
guix/build/android-ndk-build-system.scm | 88 ++
guix/build/profiles.scm | 14 +-
guix/build/union.scm | 48 +-
guix/gexp.scm | 37 +-
guix/packages.scm | 13 +-
guix/profiles.scm | 19 +-
guix/scripts/lint.scm | 2 +-
guix/scripts/pack.scm | 218 +++-
guix/search-paths.scm | 15 +-
guix/utils.scm | 24 +-
tests/graph.scm | 2 +-
tests/guix-pack.sh | 10 +-
tests/profiles.scm | 57 +-
tests/union.scm | 18 +
tests/utils.scm | 8 +-
98 files changed, 4405 insertions(+), 913 deletions(-)
diff --cc gnu/local.mk
index d962613,fbdb309..a5458c1
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -744,8 -744,10 +747,9 @@@ dist_patch_DATA =
%D%/packages/patches/gpm-glibc-2.26.patch \
%D%/packages/patches/gpsbabel-minizip.patch \
%D%/packages/patches/gpsbabel-qstring.patch \
- %D%/packages/patches/graphite2-ffloat-store.patch \
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/groff-source-date-epoch.patch \
+ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/gsl-test-i686.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
@@@ -872,8 -876,13 +877,10 @@@
%D%/packages/patches/libtool-skip-tests2.patch \
%D%/packages/patches/libusb-0.1-disable-tests.patch \
%D%/packages/patches/libusb-for-axoloti.patch \
+ %D%/packages/patches/libutils-add-includes.patch \
+ %D%/packages/patches/libutils-remove-damaging-includes.patch \
%D%/packages/patches/libvdpau-va-gl-unbundle.patch \
- %D%/packages/patches/libvorbis-CVE-2017-14632.patch \
- %D%/packages/patches/libvorbis-CVE-2017-14633.patch \
%D%/packages/patches/libvpx-CVE-2016-2818.patch \
- %D%/packages/patches/libxcb-python-3.5-compat.patch \
%D%/packages/patches/libxslt-generated-ids.patch \
%D%/packages/patches/libxt-guix-search-paths.patch \
%D%/packages/patches/lierolibre-check-unaligned-access.patch \
diff --cc gnu/packages/commencement.scm
index 9f85781,2791409..7ad1802
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -249,40 -262,42 +249,40 @@@
"--(with-system-zlib|enable-languages.*)" <>)
,flags)))
((#:phases phases)
- `(alist-cons-after
- 'unpack 'unpack-gmp&co
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((gmp (assoc-ref %build-inputs "gmp-source"))
- (mpfr (assoc-ref %build-inputs "mpfr-source"))
- (mpc (assoc-ref %build-inputs "mpc-source")))
-
- ;; To reduce the set of pre-built bootstrap inputs, build
- ;; GMP & co. from GCC.
- (for-each (lambda (source)
- (or (zero? (system* "tar" "xvf" source))
- (error "failed to unpack tarball"
- source)))
- (list gmp mpfr mpc))
-
- ;; Create symlinks like `gmp' -> `gmp-x.y.z'.
- ,@(map (lambda (lib)
- ;; Drop trailing letters, as gmp-6.0.0a unpacks
- ;; into gmp-6.0.0.
- `(symlink ,(string-trim-right
- (package-full-name lib "-")
- char-set:letter)
- ,(package-name lib)))
- (list gmp-6.0 mpfr mpc))))
- (alist-cons-after
- 'install 'symlink-libgcc_eh
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "lib")))
- ;; Glibc wants to link against libgcc_eh, so provide
- ;; it.
- (with-directory-excursion
- (string-append out "/lib/gcc/"
- ,(boot-triplet)
- "/" ,(package-version gcc))
- (symlink "libgcc.a" "libgcc_eh.a"))))
- ,phases))))))
+ `(modify-phases ,phases
+ (add-after 'unpack 'unpack-gmp&co
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((gmp (assoc-ref %build-inputs "gmp-source"))
+ (mpfr (assoc-ref %build-inputs "mpfr-source"))
+ (mpc (assoc-ref %build-inputs "mpc-source")))
+
+ ;; To reduce the set of pre-built bootstrap inputs,
build
+ ;; GMP & co. from GCC.
+ (for-each (lambda (source)
+ (invoke "tar" "xvf" source))
+ (list gmp mpfr mpc))
+
+ ;; Create symlinks like `gmp' -> `gmp-x.y.z'.
+ ,@(map (lambda (lib)
+ ;; Drop trailing letters, as gmp-6.0.0a unpacks
+ ;; into gmp-6.0.0.
+ `(symlink ,(string-trim-right
- (package-full-name lib)
++ (package-full-name lib "-")
+ char-set:letter)
+ ,(package-name lib)))
+ (list gmp-6.0 mpfr mpc))
+ #t)))
+ (add-after 'install 'symlink-libgcc_eh
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "lib")))
+ ;; Glibc wants to link against libgcc_eh, so provide
+ ;; it.
+ (with-directory-excursion
+ (string-append out "/lib/gcc/"
+ ,(boot-triplet)
+ "/" ,(package-version gcc))
+ (symlink "libgcc.a" "libgcc_eh.a"))
+ #t))))))))
(inputs `(("gmp-source" ,(package-source gmp-6.0))
("mpfr-source" ,(package-source mpfr))
diff --cc gnu/packages/guile.scm
index ae7813c,9e24e90..578b451
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -15,8 -15,10 +15,10 @@@
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Theodoros Foradis <address@hidden>
;;; Copyright © 2017 Nils Gillmann <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
+ ;;; Copyright © 2018 Arun Isaac <address@hidden>
+ ;;; Copyright © 2018 Pierre-Antoine Rouby <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/linux.scm
index 427f9bd,0c58b90..85d83d8
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -3279,8 -3275,22 +3279,19 @@@ from the btrfs-progs package. It is me
"/f2fs-tools.git/snapshot/" name "-" version ".tar.gz"))
(sha256
(base32
- "1bir9ladb58ijlcvrjrq1fb1xv5ys50zdjaq0yzliib0apsyrnyl"))))
+ "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k"))))
+
(build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (zero? (system* "autoreconf" "-vif"))))
+ (add-after 'install 'install-headers
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (out-include (string-append out "/include")))
+ (install-file "include/f2fs_fs.h" out-include)
+ (install-file "mkfs/f2fs_format_utils.h" out-include)
+ #t))))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
diff --cc gnu/packages/python.scm
index 0805525,d8d615e..b7b7714
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -10819,18 -10772,21 +10861,20 @@@ and bit flag values."
(package
(name "python-attrs")
(version "17.4.0")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "attrs" version))
- (sha256
- (base32
- "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w"))))
+ (source (origin
+ (method url-fetch)
+ (uri (pypi-uri "attrs" version))
+ (sha256
+ (base32
+ "1jafnn1kzd6qhxgprhx6y6ik1r5m2rilx25syzcmq03azp660y8w"))))
(build-system python-build-system)
(native-inputs
- `(("python-pytest" ,python-pytest)
+ `(("python-coverage" ,python-coverage)
("python-hypothesis" ,python-hypothesis)
- ("python-zope-interface" ,python-zope-interface)
- ("python-six" ,python-six)))
+ ("python-pytest" ,python-pytest)
+ ("python-six" ,python-six)
+ ("python-sphinx" ,python-sphinx)
+ ("python-zope-interface" ,python-zope-interface)))
(home-page "https://github.com/python-attrs/attrs/";)
(synopsis "Attributes without boilerplate")
(description "@code{attrs} is a Python package with class decorators that