diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/gpodder.scm | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar guix-patches-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/packages/gpodder.scm')
| -rw-r--r-- | gnu/packages/gpodder.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 245bca01a5..3b1db544a2 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages freedesktop) @@ -37,6 +38,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages groff) #:use-module (gnu packages mp3) + #:use-module (gnu packages music) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -68,12 +70,14 @@ ("python-pytest-httpserver" ,python-pytest-httpserver) ("which" ,which))) (inputs - `(("gtk+" ,gtk+) + `(("bash-minimal" ,bash-minimal) + ("gtk+" ,gtk+) ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) ("python-requests" ,python-requests) ("python-dbus" ,python-dbus) ("python-html5lib" ,python-html5lib) + ("python-mutagen" ,python-mutagen) ("python-mygpoclient" ,python-mygpoclient) ("python-podcastparser" ,python-podcastparser) ("youtube-dl" ,youtube-dl) @@ -89,8 +93,9 @@ (("xdg-open") (string-append xdg-utils "/bin/xdg-open"))) #t))) (replace 'check - (lambda _ - (invoke "make" "unittest"))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "unittest")))) ;; 'msgmerge' introduces non-determinism by resetting the ;; POT-Creation-Date in .po files. (add-before 'install 'do-not-run-msgmerge |