[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Ricardo Wurmus |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 14 Mar 2018 12:47:11 -0400 (EDT) |
rekado pushed a commit to branch core-updates
in repository guix.
commit 8c72ed923d77ee55989965bb02628043799b9548
Merge: 189be33 aac6cbb
Author: Ricardo Wurmus <address@hidden>
Date: Wed Mar 14 17:37:20 2018 +0100
Merge branch 'master' into core-updates
Makefile.am | 4 +-
README | 2 +-
config-daemon.ac | 29 +-
configure.ac | 2 +-
doc/guix.texi | 1504 +-
gnu/build/linux-modules.scm | 183 +-
gnu/local.mk | 33 +-
gnu/packages/abiword.scm | 2 +-
gnu/packages/accessibility.scm | 9 +-
gnu/packages/ada.scm | 61 +
gnu/packages/admin.scm | 84 +-
gnu/packages/agda.scm | 86 +
gnu/packages/algebra.scm | 103 +-
gnu/packages/animation.scm | 1 +
gnu/packages/audio.scm | 25 +-
gnu/packages/autotools.scm | 33 +-
gnu/packages/backup.scm | 5 +-
gnu/packages/base.scm | 10 +
gnu/packages/bioconductor.scm | 42 +
gnu/packages/bioinformatics.scm | 1133 +-
gnu/packages/boost.scm | 14 +
gnu/packages/build-tools.scm | 6 +-
gnu/packages/calcurse.scm | 5 +-
gnu/packages/cdrom.scm | 19 +-
gnu/packages/check.scm | 297 +-
gnu/packages/ci.scm | 6 +-
gnu/packages/cmake.scm | 59 +-
gnu/packages/code.scm | 63 +-
gnu/packages/commencement.scm | 54 +-
gnu/packages/compression.scm | 56 +-
gnu/packages/conky.scm | 4 +-
gnu/packages/cran.scm | 1005 +-
gnu/packages/crypto.scm | 15 +-
gnu/packages/curl.scm | 31 +-
gnu/packages/databases.scm | 101 +-
gnu/packages/debian.scm | 170 +
gnu/packages/debug.scm | 16 +-
gnu/packages/dictionaries.scm | 17 +-
gnu/packages/django.scm | 66 +-
gnu/packages/docbook.scm | 5 +-
gnu/packages/emacs.scm | 74 +-
gnu/packages/embedded.scm | 5 +-
gnu/packages/enlightenment.scm | 15 +-
gnu/packages/file-systems.scm | 1 +
gnu/packages/firmware.scm | 52 +-
gnu/packages/flashing-tools.scm | 14 +-
gnu/packages/fonts.scm | 22 +
gnu/packages/fontutils.scm | 2 +-
gnu/packages/freedesktop.scm | 14 +-
gnu/packages/fribidi.scm | 9 +-
gnu/packages/ftp.scm | 4 +-
gnu/packages/game-development.scm | 26 +-
gnu/packages/games.scm | 3 +-
gnu/packages/gd.scm | 43 +-
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/glib.scm | 49 +-
gnu/packages/gnome.scm | 47 +-
gnu/packages/gnunet.scm | 2 +-
gnu/packages/gnupg.scm | 61 +-
gnu/packages/gnuzilla.scm | 135 +-
gnu/packages/golang.scm | 122 +-
gnu/packages/gps.scm | 1 +
gnu/packages/graph.scm | 29 +-
gnu/packages/graphics.scm | 6 +-
gnu/packages/gstreamer.scm | 4 +-
gnu/packages/gtk.scm | 140 +-
gnu/packages/guile.scm | 77 +-
gnu/packages/haskell-web.scm | 35 +
gnu/packages/haskell.scm | 216 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 67 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/inkscape.scm | 19 +-
gnu/packages/irc.scm | 14 +-
gnu/packages/java.scm | 1349 +-
gnu/packages/julia.scm | 7 +-
gnu/packages/kde-frameworks.scm | 5 +-
gnu/packages/kodi.scm | 27 +-
gnu/packages/libcanberra.scm | 2 +-
gnu/packages/libevent.scm | 4 +-
gnu/packages/libffi.scm | 20 +-
gnu/packages/libftdi.scm | 7 +-
gnu/packages/libreoffice.scm | 25 +-
gnu/packages/libusb.scm | 1 +
gnu/packages/linux.scm | 42 +-
gnu/packages/lisp.scm | 51 +-
gnu/packages/logging.scm | 4 +-
gnu/packages/mail.scm | 29 +-
gnu/packages/make-bootstrap.scm | 35 +-
gnu/packages/man.scm | 7 +-
gnu/packages/mate.scm | 4 +-
gnu/packages/maths.scm | 67 +-
gnu/packages/maven.scm | 130 +
gnu/packages/messaging.scm | 4 +-
gnu/packages/mingw.scm | 20 +-
gnu/packages/monitoring.scm | 5 +-
gnu/packages/music.scm | 33 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 50 +-
gnu/packages/node.scm | 67 +-
gnu/packages/ntp.scm | 13 +-
gnu/packages/ocaml.scm | 19 +-
gnu/packages/openstack.scm | 343 +-
gnu/packages/package-management.scm | 15 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 54 +-
.../patches/antlr3-3_1-fix-java8-compilation.patch | 35 +
.../patches/antlr3-3_3-fix-java8-compilation.patch | 35 +
.../patches/ceph-disable-cpu-optimizations.patch | 64 +-
.../patches/ceph-disable-unittest-throttle.patch | 52 -
gnu/packages/patches/ceph-rocksdb-compat.patch | 63 +
gnu/packages/patches/dblatex-remove-multirow.patch | 30 -
gnu/packages/patches/dovecot-CVE-2017-15132.patch | 36 -
gnu/packages/patches/gd-CVE-2018-5711.patch | 61 +
.../patches/glibc-allow-kernel-2.6.32.patch | 46 +
gnu/packages/patches/guile-linux-syscalls.patch | 50 +-
gnu/packages/patches/icecat-bug-1348660-pt5.patch | 727 -
gnu/packages/patches/icecat-bug-1414945.patch | 73 -
gnu/packages/patches/icecat-bug-1415133.patch | 40 -
gnu/packages/patches/icecat-bug-1424373-pt2.patch | 183 -
gnu/packages/patches/java-jeromq-fix-tests.patch | 253 +
gnu/packages/patches/lrzip-CVE-2017-8842.patch | 23 +
...erl-gd-options-passthrough-and-fontconfig.patch | 53 -
.../patches/python-mox3-python3.6-compat.patch | 43 +
.../patches/python-parse-too-many-fields.patch | 52 -
gnu/packages/patches/thefuck-test-environ.patch | 20 +-
gnu/packages/patches/wavpack-CVE-2018-6767.patch | 119 +
...xmaxima-do-not-use-old-gnuplot-parameters.patch | 26 +
gnu/packages/patches/zsh-CVE-2018-7548.patch | 48 +
gnu/packages/patches/zsh-CVE-2018-7549.patch | 56 +
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 124 +-
gnu/packages/photo.scm | 56 +
gnu/packages/php.scm | 22 +-
gnu/packages/polkit.scm | 17 +-
gnu/packages/pretty-print.scm | 14 +-
gnu/packages/profiling.scm | 34 +-
gnu/packages/pulseaudio.scm | 3 +-
gnu/packages/python-crypto.scm | 9 +-
gnu/packages/python-web.scm | 105 +-
gnu/packages/python.scm | 415 +-
gnu/packages/qt.scm | 2 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 258 +
gnu/packages/samba.scm | 8 +-
gnu/packages/sawfish.scm | 2 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/sdcc.scm | 11 +-
gnu/packages/sdl.scm | 4 +-
gnu/packages/search.scm | 4 +-
gnu/packages/serialization.scm | 8 +-
gnu/packages/shells.scm | 2 +
gnu/packages/spice.scm | 1 +
gnu/packages/ssh.scm | 8 +-
gnu/packages/sssd.scm | 6 +-
gnu/packages/statistics.scm | 208 +-
gnu/packages/storage.scm | 42 +-
gnu/packages/suckless.scm | 4 +-
gnu/packages/syncthing.scm | 226 +-
gnu/packages/tex.scm | 279 +-
gnu/packages/text-editors.scm | 6 +-
gnu/packages/textutils.scm | 64 +-
gnu/packages/time.scm | 16 +-
gnu/packages/tls.scm | 14 +-
gnu/packages/tor.scm | 11 +-
gnu/packages/version-control.scm | 142 +-
gnu/packages/video.scm | 74 +-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/vpn.scm | 16 +-
gnu/packages/vulkan.scm | 4 +-
gnu/packages/web-browsers.scm | 14 +-
gnu/packages/web.scm | 114 +-
gnu/packages/wine.scm | 93 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/wv.scm | 12 +-
gnu/packages/xdisorg.scm | 33 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xml.scm | 42 +-
gnu/packages/xorg.scm | 106 +-
gnu/packages/zile.scm | 2 +-
gnu/services/base.scm | 285 +-
gnu/services/cgit.scm | 686 +
gnu/services/configuration.scm | 17 +-
gnu/services/databases.scm | 104 +-
gnu/services/dict.scm | 3 +-
gnu/services/mail.scm | 147 +-
gnu/services/messaging.scm | 106 +-
gnu/services/networking.scm | 102 +-
gnu/services/version-control.scm | 121 -
gnu/system.scm | 10 +-
gnu/system/examples/beaglebone-black.tmpl | 9 +-
gnu/system/install.scm | 9 +-
gnu/system/linux-initrd.scm | 164 +-
gnu/system/mapped-devices.scm | 38 +-
gnu/system/vm.scm | 24 +-
gnu/tests/databases.scm | 55 +
gnu/tests/install.scm | 11 +-
gnu/tests/mail.scm | 120 +-
gnu/tests/version-control.scm | 3 +-
guix/build-system/minify.scm | 3 +-
guix/build-system/trivial.scm | 42 +-
guix/build/download.scm | 10 +-
guix/build/git.scm | 43 +-
guix/build/syscalls.scm | 48 +-
guix/gexp.scm | 7 +
guix/glob.scm | 97 +
guix/hash.scm | 26 +-
guix/http-client.scm | 154 +-
guix/import/cpan.scm | 6 +-
guix/profiles.scm | 20 +-
guix/scripts/environment.scm | 159 +-
guix/scripts/package.scm | 16 +-
guix/scripts/substitute.scm | 18 +-
guix/scripts/system.scm | 54 +-
guix/ui.scm | 26 +-
m4/guix.m4 | 17 -
po/guix/POTFILES.in | 1 +
po/guix/pt_BR.po | 1738 +-
po/packages/LINGUAS | 1 +
po/packages/zh_CN.po | 19383 +++++++++++++++++++
tests/glob.scm | 58 +
tests/guix-build.sh | 2 +-
tests/guix-environment-container.sh | 25 +
tests/guix-package.sh | 18 +-
tests/hash.scm | 19 +-
tests/packages.scm | 20 +-
tests/profiles.scm | 7 +-
227 files changed, 32733 insertions(+), 5271 deletions(-)
diff --cc gnu/local.mk
index a29a811,165b830..d7eda9f
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1152,7 -1166,10 +1158,8 @@@ dist_patch_DATA =
%D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \
%D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \
%D%/packages/patches/wpa-supplicant-krack-followups.patch \
+ %D%/packages/patches/wxmaxima-do-not-use-old-gnuplot-parameters.patch
\
%D%/packages/patches/xboing-CVE-2004-0149.patch \
- %D%/packages/patches/xcb-proto-python3-print.patch \
- %D%/packages/patches/xcb-proto-python3-whitespace.patch \
%D%/packages/patches/xdotool-fix-makefile.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
%D%/packages/patches/xf86-video-ast-remove-mibstore.patch \
diff --cc gnu/packages/algebra.scm
index 8c42ac3,2aa1777..57f273c
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@@ -3,9 -3,9 +3,9 @@@
;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <address@hidden>
;;; Copyright © 2016, 2017, 2018 Nicolas Goaziou <address@hidden>
;;; Copyright © 2014 Mark H Weaver <address@hidden>
- ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2016, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2017 Eric Bavier <address@hidden>
;;;
diff --cc gnu/packages/base.scm
index 2a50080,e91f7d4..f630cce
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@@ -12,7 -12,7 +12,8 @@@
;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2017 Eric Bavier <address@hidden>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/gnunet.scm
index 0569395,f4eacd3..ac7f8ab
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@@ -321,8 -321,13 +321,8 @@@ kinds of basic applications for the fou
(base32
"0k6mn28isjlxrnvbnblab3nh2xqx1b7san8k98kc35ap9lq0iz8w"))))
(build-system gnu-build-system)
- (arguments
- '(#:phases (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (invoke "autoreconf" "-vfi"))))))
(native-inputs `(("pkg-config" ,pkg-config)
- ("autoconf" ,(autoconf-wrapper))
+ ("autoconf" ,autoconf-wrapper)
("automake" ,automake)))
(inputs `(("guile" ,guile-2.0)
("gnunet" ,gnunet)))
diff --cc gnu/packages/guile.scm
index a4685ec,1e8aca1..7f01441
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -1982,30 -2011,25 +2000,25 @@@ manipulate repositories of the Git vers
(package-for-guile-2.0 guile-git))
(define-public guile-syntax-highlight
- (let ((commit "a047675e66861b647426372aa2ba7820f749616d")
- (revision "0"))
- (package
- (name "guile-syntax-highlight")
- (version (string-append "0.0." revision "."
- (string-take commit 7)))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "git://dthompson.us/guile-syntax-highlight.git")
- (commit commit)))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "1zjr6sg3n7xbdsliy45i39dqanxvcms58ayx36wxrz72zpq58vq3"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)))
- (inputs
- `(("guile" ,guile-2.2)))
- (synopsis "General-purpose syntax highlighter for GNU Guile")
- (description "Guile-syntax-highlight is a general-purpose syntax
+ (package
+ (name "guile-syntax-highlight")
+ (version "0.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://files.dthompson.us/";
+ "guile-syntax-highlight/"
+ "guile-syntax-highlight-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1p771kq15x83483m23bhah1sz6vkalg3drm7x279f4j1cxligkzi"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("guile" ,guile-2.2)))
- (synopsis "General-purpose syntax highlighter for GNU Guile")
- (description "Guile-syntax-highlight is a general-purpose syntax
++ (synopsis "General-purpose syntax highlighter for GNU Guile")
++ (description "Guile-syntax-highlight is a general-purpose syntax
highlighting library for GNU Guile. It can parse code written in various
programming languages into a simple s-expression that can be converted to
HTML (via SXML) or any other format for rendering.")