aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2020-10-13 09:28:30 +0300
committerEfraim Flashner <efraim@flashner.co.il>2020-10-13 10:46:23 +0300
commit3cdcdcf539827819dfb6357e47404cdb4bec268a (patch)
tree2077125727d058965f4656a3c6cc8be545840d19
parent673de819ff31ef7837753fbc83176233f668ae83 (diff)
downloadguix-3cdcdcf539827819dfb6357e47404cdb4bec268a.tar
guix-3cdcdcf539827819dfb6357e47404cdb4bec268a.tar.gz
gnu: newsboat: Update to 2.21.
* gnu/packages/syndication.scm (newsboat): Update to 2.21. [source]: Remove snippet. [inputs]: Replace json-c-0.13 with json-c. [arguments]: In cargo-inputs replace rust-gettext-rs-0.4 with 0.5, rust-rand-0.6 with 0.7. Remove rust-dirs-2.0, rust-libz-1, rust-percent-encoding-2, rust-smallvec-0.6. Add rust-lazy-static-1. Add new phase to patch the source slightly.
-rw-r--r--gnu/packages/syndication.scm26
1 files changed, 11 insertions, 15 deletions
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index ba626593a7..e174df0d9e 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -53,7 +53,7 @@
(define-public newsboat
(package
(name "newsboat")
- (version "2.20.1")
+ (version "2.21")
(source
(origin
(method url-fetch)
@@ -61,13 +61,7 @@
"/newsboat-" version ".tar.xz"))
(sha256
(base32
- "0rimjikni96m52vhymgsg1b9g99af6ggyzd1lpvhgqsznxwj0y42"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (substitute* "rust/libnewsboat/Cargo.toml"
- (("= 1.0.17") "1.0.17"))
- #t))))
+ "0ccwbb3maini18453wjqn8m3bd7zzm6dn5a9vpb8smxv8vfv6ihc"))))
(build-system cargo-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -77,7 +71,7 @@
("asciidoctor" ,ruby-asciidoctor)))
(inputs
`(("curl" ,curl)
- ("json-c" ,json-c-0.13)
+ ("json-c" ,json-c)
("libxml2" ,libxml2)
("ncurses" ,ncurses)
("stfl" ,stfl)
@@ -93,17 +87,14 @@
("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4)
- ("rust-dirs" ,rust-dirs-2.0)
- ("rust-gettext-rs" ,rust-gettext-rs-0.4)
+ ("rust-gettext-rs" ,rust-gettext-rs-0.5)
("rust-gettext-sys" ,rust-gettext-sys-0.19)
+ ("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2)
- ("rust-libz-sys" ,rust-libz-sys-1)
("rust-natord" ,rust-natord-1.0)
("rust-nom" ,rust-nom-5)
("rust-once-cell" ,rust-once-cell-1)
- ("rust-percent-encoding" ,rust-percent-encoding-2)
- ("rust-rand" ,rust-rand-0.6)
- ("rust-smallvec" ,rust-smallvec-0.6)
+ ("rust-rand" ,rust-rand-0.7)
("rust-url" ,rust-url-2)
("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-xdg" ,rust-xdg-2.2))
@@ -119,6 +110,11 @@
(delete-file-recursively
(string-append vendor-dir "/" ,name "-" ,version ".tar.xz"))
#t))
+ (add-after 'unpack 'patch-source
+ (lambda _
+ (substitute* "Makefile"
+ (("Cargo.lock") ""))
+ #t))
(replace 'build
(lambda* args
((assoc-ref gnu:%standard-phases 'build)