diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/mpd.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/mpd.scm')
| -rw-r--r-- | gnu/packages/mpd.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index d33bde11ac..7670cf573e 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com> ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2020 Lars-Dominik Braun <lars@6xq.net> -;;; Copyright © 2020 Simon Streit <simon@netpanic.org> +;;; Copyright © 2020, 2021 Simon Streit <simon@netpanic.org> ;;; Copyright © 2021 Noah Evans <noah@nevans.me> ;;; ;;; This file is part of GNU Guix. @@ -383,7 +383,7 @@ other MPD frontends.") (define-public mpdris2 (package (name "mpdris2") - (version "0.8") + (version "0.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -392,7 +392,7 @@ other MPD frontends.") (file-name (git-file-name name version)) (sha256 (base32 - "048b8acsd1b8kcxzd9fsh5p9g2an9c4rznicfcpyrsjz5syv894h")))) + "17ys8ccr3h6vix0agvhz859slz0phhk7lwqn5bg4az8s7zgqm3nm")))) (build-system gnu-build-system) ;; Manually wrap the binary, because we’re not using python-build-system. (arguments @@ -447,7 +447,7 @@ support") ("libebur128" ,libebur128) ("libmtp" ,libmtp) ("mpg123" ,mpg123) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) ("taglib" ,taglib) |