[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Wed, 25 Nov 2020 19:10:01 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit bff94a5a537c2c484f9f6e98cab75195c3dde9e7
Merge: c73a7f7 f36bee1
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Thu Nov 26 01:08:35 2020 +0100
Merge branch 'master' into staging
doc/guix.texi | 36 +++-
etc/guix-daemon.cil.in | 18 +-
etc/news.scm | 17 ++
.../text-mode/guix-commit-message-add-cl-package | 6 +-
gnu/ci.scm | 16 +-
gnu/local.mk | 1 +
gnu/packages/audio.scm | 11 +-
gnu/packages/bioinformatics.scm | 79 +++++---
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/bootloaders.scm | 30 ++--
gnu/packages/ci.scm | 6 +-
gnu/packages/cmake.scm | 71 +++++++-
gnu/packages/databases.scm | 4 +-
gnu/packages/debian.scm | 122 ++++++++++++-
gnu/packages/dns.scm | 4 +-
gnu/packages/education.scm | 16 +-
gnu/packages/emacs-xyz.scm | 63 ++++++-
gnu/packages/engineering.scm | 60 ++++++-
gnu/packages/fonts.scm | 6 +-
gnu/packages/games.scm | 2 +-
gnu/packages/geo.scm | 4 +-
gnu/packages/gnome.scm | 6 +-
gnu/packages/gnupg.scm | 46 -----
gnu/packages/gstreamer.scm | 7 +
gnu/packages/gtk.scm | 4 +-
gnu/packages/guile.scm | 6 +-
gnu/packages/haskell-apps.scm | 5 +-
gnu/packages/haskell-xyz.scm | 54 +++++-
gnu/packages/image.scm | 25 ++-
gnu/packages/linux.scm | 72 ++++----
gnu/packages/lisp-xyz.scm | 90 ++++++++++
gnu/packages/machine-learning.scm | 72 ++++++++
gnu/packages/mail.scm | 12 +-
gnu/packages/mercury.scm | 8 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/mpi.scm | 10 ++
gnu/packages/networking.scm | 4 +-
gnu/packages/patches/mupdf-fix-linkage.patch | 27 +++
gnu/packages/patches/mutt-store-references.patch | 13 +-
gnu/packages/pdf.scm | 119 +++++++++---
gnu/packages/plotutils.scm | 4 +-
gnu/packages/protobuf.scm | 5 +-
gnu/packages/python-science.scm | 26 +++
gnu/packages/python-web.scm | 4 +-
gnu/packages/python-xyz.scm | 34 +++-
gnu/packages/radio.scm | 4 +-
gnu/packages/re2c.scm | 6 +-
gnu/packages/regex.scm | 5 +-
gnu/packages/rpc.scm | 11 +-
gnu/packages/scheme.scm | 2 +-
gnu/packages/skarnet.scm | 5 +-
gnu/packages/ssh.scm | 30 ----
gnu/packages/storage.scm | 4 +-
gnu/packages/terminals.scm | 9 +-
gnu/packages/version-control.scm | 37 +++-
gnu/packages/video.scm | 20 ++-
gnu/packages/virtualization.scm | 4 +-
gnu/packages/web.scm | 7 +-
gnu/packages/xdisorg.scm | 37 +++-
gnu/packages/xorg.scm | 6 +-
gnu/services/base.scm | 3 +-
gnu/system.scm | 11 +-
gnu/system/linux-initrd.scm | 11 +-
gnu/system/mapped-devices.scm | 199 +++++++++++++--------
gnu/tests/install.scm | 87 +++++++++
guix/scripts/weather.scm | 36 ++--
66 files changed, 1334 insertions(+), 433 deletions(-)
diff --cc gnu/packages/gstreamer.scm
index af50119,738e881..3625755
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@@ -703,22 -668,14 +704,26 @@@ model to base your own plug-in on, her
""))
#t)))
'())
- (add-after 'unpack 'disable-failing-test
- (lambda _
- ;; FIXME: Why is this failing.
- (substitute* "tests/check/meson.build"
- ((".*elements/dash_mpd\\.c.*") "")
- ((".*elements/curlhttpsrc\\.c.*") "")
- ((".*elements/webrtcbin\\.c.*") ""))
- #t)))))
+ (add-after 'unpack 'adjust-tests
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
+ "gst-plugins-good")))
+ (substitute* "tests/check/meson.build"
+ ;; Make gst-plugin-good available for tests, see
+ ;;
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1426
+ (("'GST_PLUGIN_SYSTEM_PATH_1_0', ''")
+ (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
+ gst-plugins-good "/lib/gstreamer-1.0'"))
++
++ ;; FIXME: Why is this failing.
++ ((".*elements/dash_mpd\\.c.*") "")
++
+ ;; These tests are flaky and occasionally time out:
+ ;;
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
+ ((".*elements/curlhttpsrc\\.c.*") "")
+ ;;
https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
+ ((".*elements/dtls\\.c.*") ""))
+ #t))))))
(propagated-inputs
`(("gst-plugins-base" ,gst-plugins-base)))
(native-inputs