diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/gpodder.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/gpodder.scm')
| -rw-r--r-- | gnu/packages/gpodder.scm | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 8df7c0c22b..474065836e 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> +;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,7 @@ (define-public gpodder (package (name "gpodder") - (version "3.10.21") + (version "3.11.0") (source (origin (method git-fetch) @@ -57,7 +58,7 @@ (url "https://github.com/gpodder/gpodder") (commit version))) (sha256 - (base32 "0n73jm5ypsj962gpr0dk10lqh83giqsczm63wchyhmrkyf1wgga1")) + (base32 "1387n0kgpan869c09smq5jnc3316vz8majl9bw01bw7cxg4vss3p")) (file-name (git-file-name name version)) (patches (search-patches "gpodder-disable-updater.patch")))) (build-system python-build-system) @@ -213,27 +214,31 @@ in Python.") (license license:isc))) (define-public castget - (package - (name "castget") - (version "2.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mlj/castget") - (commit (string-append "rel_" (string-replace-substring - version "." "_"))))) - (sha256 - (base32 "1129x64rw587q3sdpa3lrgs0gni5f0siwbvmfz8ya4zkbhgi2ik7")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool pkg-config ronn-ng)) - (inputs (list curl glib id3lib libxml2)) - (synopsis "Command line podcast downloader") - (description - "castget is a simple, command-line based RSS enclosure downloader. It is + ;; Since ronn-ng uses a newer ruby-nokogiri, the test suite would fail on a + ;; free call with the error: "free(): invalid pointer". Use the latest + ;; commit, which is immune to that problem. + (let ((revision "0") + (commit "da9727de1b9e4e636be21bf07c73eb41f5d8439b")) + (package + (name "castget") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlj/castget") + (commit commit))) + (sha256 + (base32 "0d5ji21af5mfj1xa90v4hp104c1ipy076175kp7nzz1c4sxdadff")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + (list autoconf automake libtool pkg-config ronn-ng)) + (inputs (list curl glib taglib libxml2)) + (synopsis "Command line podcast downloader") + (description + "castget is a simple, command-line based RSS enclosure downloader. It is primarily intended for automatic, unattended downloading of podcasts. It uses libcurl for the download process.") - (license license:lgpl2.1+) - (home-page "https://castget.johndal.com"))) + (license license:lgpl2.1+) + (home-page "https://castget.johndal.com")))) |