[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Tue, 13 Aug 2019 14:47:57 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 462ad9f56b9665b8d22960acee73ad91f1052c9c
Merge: 7f5f61a 1b1b006
Author: Marius Bakke <address@hidden>
Date: Tue Aug 13 20:42:06 2019 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 27 +-
gnu/local.mk | 14 +-
gnu/machine.scm | 12 +-
gnu/machine/ssh.scm | 174 +-
gnu/packages/admin.scm | 46 +-
gnu/packages/algebra.scm | 7 +-
gnu/packages/audio.scm | 4 +-
gnu/packages/bioconductor.scm | 45 +-
gnu/packages/bioinformatics.scm | 455 +-
gnu/packages/bittorrent.scm | 61 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/chromium.scm | 98 +-
gnu/packages/cran.scm | 337 +-
gnu/packages/crates-io.scm | 890 +++-
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 39 +-
gnu/packages/docbook.scm | 3 +-
gnu/packages/docker.scm | 16 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 555 ++-
gnu/packages/emulators.scm | 20 +-
gnu/packages/enchant.scm | 4 +-
gnu/packages/engineering.scm | 47 +
gnu/packages/finance.scm | 43 +-
gnu/packages/fonts.scm | 4 +-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/games.scm | 4 +
gnu/packages/gl.scm | 15 +-
gnu/packages/gnome.scm | 115 +-
gnu/packages/golang.scm | 10 +-
gnu/packages/graphics.scm | 4 +-
gnu/packages/gtk.scm | 6 +-
gnu/packages/guile-xyz.scm | 21 +-
gnu/packages/guile.scm | 44 +-
gnu/packages/haskell-apps.scm | 18 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-crypto.scm | 63 +
gnu/packages/haskell-web.scm | 169 +
gnu/packages/haskell-xyz.scm | 276 ++
gnu/packages/haskell.scm | 172 +-
gnu/packages/image.scm | 17 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/kde.scm | 4 +-
gnu/packages/libevent.scm | 4 +-
gnu/packages/linux.scm | 46 +-
gnu/packages/lisp.scm | 54 +-
gnu/packages/machine-learning.scm | 17 +-
gnu/packages/mail.scm | 16 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 8 +-
gnu/packages/mp3.scm | 3 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/multiprecision.scm | 25 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/nss.scm | 5 +-
gnu/packages/package-management.scm | 11 +-
.../patches/emacs-dired-toggle-sudo-emacs-26.patch | 49 +
gnu/packages/patches/flac-CVE-2017-6888.patch | 29 -
.../isc-dhcp-4.4.1-fixes-for-newer-bind.patch | 100 +
gnu/packages/patches/libmad-frame-length.patch | 199 -
gnu/packages/patches/libmad-length-check.patch | 819 ++++
gnu/packages/patches/libmad-md_size.patch | 60 +
.../patches/libvirt-remove-ATTRIBUTE_UNUSED.patch | 34 -
gnu/packages/patches/mame-rapidjson-fix.patch | 37 +
gnu/packages/patches/nss-freebl-stubs.patch | 20 +
.../patches/pcre2-fix-jit_match-crash.patch | 25 +
gnu/packages/patches/scribus-poppler.patch | 72 -
gnu/packages/patches/strace-ipc-tests.patch | 30 +
gnu/packages/pcre.scm | 2 +-
gnu/packages/pdf.scm | 8 +-
gnu/packages/perl.scm | 8 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 10 +-
gnu/packages/plotutils.scm | 3 +-
gnu/packages/python-xyz.scm | 25 +-
gnu/packages/regex.scm | 4 +-
gnu/packages/ruby.scm | 6 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/scanner.scm | 12 +-
gnu/packages/scribus.scm | 106 +-
gnu/packages/search.scm | 6 +-
gnu/packages/security-token.scm | 4 +-
gnu/packages/shells.scm | 9 +-
gnu/packages/statistics.scm | 163 +-
gnu/packages/syncthing.scm | 14 +-
gnu/packages/terminals.scm | 6 +-
gnu/packages/tex.scm | 5115 +++++++++++---------
gnu/packages/text-editors.scm | 7 +-
gnu/packages/version-control.scm | 10 +-
gnu/packages/video.scm | 60 +-
gnu/packages/vim.scm | 56 +-
gnu/packages/virtualization.scm | 12 +-
gnu/packages/vpn.scm | 18 +-
gnu/packages/vulkan.scm | 8 +-
gnu/packages/web.scm | 8 +-
gnu/packages/wine.scm | 43 +-
gnu/packages/wm.scm | 22 +-
gnu/packages/xiph.scm | 5 +-
gnu/packages/xorg.scm | 10 +-
gnu/tests/reconfigure.scm | 32 +-
guix/build-system/texlive.scm | 15 +
guix/build/ant-build-system.scm | 10 +-
guix/build/cargo-build-system.scm | 48 +-
guix/build/svn.scm | 9 +-
guix/scripts/deploy.scm | 6 +-
guix/scripts/system/reconfigure.scm | 27 +-
guix/svn-download.scm | 59 +-
108 files changed, 7747 insertions(+), 3767 deletions(-)
diff --cc gnu/local.mk
index 41f4e4e,16b63bc..c6962ae
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -958,9 -948,9 +959,10 @@@ dist_patch_DATA =
%D%/packages/patches/id3lib-CVE-2007-4460.patch \
%D%/packages/patches/idris-test-no-node.patch \
%D%/packages/patches/ilmbase-fix-tests.patch \
+ %D%/packages/patches/inkscape-poppler-0.76.patch \
%D%/packages/patches/intltool-perl-compatibility.patch \
%D%/packages/patches/irrlicht-use-system-libs.patch \
+ %D%/packages/patches/isc-dhcp-4.4.1-fixes-for-newer-bind.patch \
%D%/packages/patches/isl-0.11.1-aarch64-support.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
%D%/packages/patches/jamvm-arm.patch \
@@@ -1026,9 -1025,9 +1028,10 @@@
%D%/packages/patches/libotr-test-auth-fix.patch \
%D%/packages/patches/libmad-armv7-thumb-pt1.patch \
%D%/packages/patches/libmad-armv7-thumb-pt2.patch \
- %D%/packages/patches/libmad-frame-length.patch \
+ %D%/packages/patches/libmad-length-check.patch \
+ %D%/packages/patches/libmad-md_size.patch \
%D%/packages/patches/libmad-mips-newgcc.patch \
+ %D%/packages/patches/libmp4v2-c++11.patch \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libreoffice-boost.patch \
diff --cc gnu/packages/guile.scm
index df71965,b8a5382..b07a570
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@@ -259,31 -286,41 +259,29 @@@ without requiring the source code to b
(max-silent-time . 36000))))) ;10 hours (needed on ARM
; when heavily loaded)
-(define-public guile-2.2.6
- (package
- (inherit guile-2.2)
- (version "2.2.6")
- (source (origin
- (inherit (package-source guile-2.2))
- (uri (string-append "mirror://gnu/guile/guile-" version
- ".tar.xz"))
- (sha256
- (base32
- "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk"))))))
-
(define-public guile-next
;; This is the upcoming Guile 3.0, with JIT support.
- (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779")
- (revision "1"))
- (package
- (inherit guile-2.2)
- (name "guile-next")
- (version "2.9.2")
- (source (origin
- (inherit (package-source guile-2.2))
- (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-";
- version ".tar.xz"))
- (sha256
- (base32
- "1w358df2wmcyzk2ziqrj2zhwqisaqraqfa3008ay23nf1a7bw0z4"))))
- (native-search-paths
- (list (search-path-specification
- (variable "GUILE_LOAD_PATH")
- (files '("share/guile/site/3.0")))
- (search-path-specification
- (variable "GUILE_LOAD_COMPILED_PATH")
- (files '("lib/guile/3.0/site-ccache"
- "share/guile/site/3.0")))))
- (properties '((ftp-server . "alpha.gnu.org")
- (upstream-name . "guile"))))))
+ (package
+ (inherit guile-2.2)
+ (name "guile-next")
+ (version "2.9.3")
+ (source (origin
+ (inherit (package-source guile-2.2))
+ (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-";
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "14990wcpysgw58kij03wbgiggmi5z94jmy7wdcqnn6ny7cimkkgr"))))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "GUILE_LOAD_PATH")
+ (files '("share/guile/site/3.0")))
+ (search-path-specification
+ (variable "GUILE_LOAD_COMPILED_PATH")
+ (files '("lib/guile/3.0/site-ccache"
+ "share/guile/site/3.0")))))
+ (properties '((ftp-server . "alpha.gnu.org")
+ (upstream-name . "guile")))))
(define (make-guile-readline guile)
(package
diff --cc gnu/packages/libevent.scm
index 58c451a,4898f0a..ae87671
--- a/gnu/packages/libevent.scm
+++ b/gnu/packages/libevent.scm
@@@ -41,21 -41,21 +41,21 @@@
(define-public libevent
(package
(name "libevent")
- (version "2.1.10")
+ (version "2.1.11")
(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
- "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6"))))
+ (method url-fetch)
+ (uri (string-append
+
"https://github.com/libevent/libevent/releases/download/release-";
+ version "-stable/libevent-" version "-stable.tar.gz"))
+ (sha256
+ (base32
- "1c25928gdv495clxk2v1d4gkr5py7ack4gx2n7d13frnld0syr78"))))
++ "0g988zqm45sj1hlhhz4il5z4dpi5dl74hzjwzl4md37a09iaqnx6"))))
(build-system gnu-build-system)
(arguments
- ;; This skips some of the tests which fail on armhf and aarch64.
+ ;; This skips some of the tests which fail on armhf and aarch64.
'(#:configure-flags '("--disable-libevent-regress")))
(inputs
- `(("python" ,python-2))) ; for 'event_rpcgen.py'
+ `(("python" ,python-wrapper))) ;for 'event_rpcgen.py'
(native-inputs
`(("which" ,which)))
(home-page "https://libevent.org/";)
diff --cc gnu/packages/mpd.scm
index d65ac33,5468ba9..e807045
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -99,10 -100,20 +99,10 @@@ interfacing MPD in the C, C++ & Objecti
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "1gbcg8icm0pp918jw1lx1j066m39zg9wyqjla328ic848j5zhbnk"))))
+ "1sjyhmq50nlccwmd8xn7m0bk8xvyixvfyr24v9dy3g86hhk0pdwm"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'...
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'expand-C++-include-path
- ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((path "CPLUS_INCLUDE_PATH")
- (gcc (assoc-ref inputs "gcc"))
- (c++ (string-append gcc "/include/c++")))
- (setenv path (string-append c++ ":" (getenv path)))
- #t))))))
+ `(#:configure-flags '("-Ddocumentation=true"))) ;the default is
'false'...
(inputs `(("ao" ,ao)
("alsa-lib" ,alsa-lib)
("avahi" ,avahi)