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.
This commit is contained in:
Efraim Flashner 2020-10-13 09:28:30 +03:00
parent 673de819ff
commit 3cdcdcf539
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -53,7 +53,7 @@ (define-module (gnu packages syndication)
(define-public newsboat (define-public newsboat
(package (package
(name "newsboat") (name "newsboat")
(version "2.20.1") (version "2.21")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -61,13 +61,7 @@ (define-public newsboat
"/newsboat-" version ".tar.xz")) "/newsboat-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0rimjikni96m52vhymgsg1b9g99af6ggyzd1lpvhgqsznxwj0y42")) "0ccwbb3maini18453wjqn8m3bd7zzm6dn5a9vpb8smxv8vfv6ihc"))))
(modules '((guix build utils)))
(snippet
'(begin
(substitute* "rust/libnewsboat/Cargo.toml"
(("= 1.0.17") "1.0.17"))
#t))))
(build-system cargo-build-system) (build-system cargo-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)
@ -77,7 +71,7 @@ (define-public newsboat
("asciidoctor" ,ruby-asciidoctor))) ("asciidoctor" ,ruby-asciidoctor)))
(inputs (inputs
`(("curl" ,curl) `(("curl" ,curl)
("json-c" ,json-c-0.13) ("json-c" ,json-c)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("stfl" ,stfl) ("stfl" ,stfl)
@ -93,17 +87,14 @@ (define-public newsboat
("rust-chrono" ,rust-chrono-0.4) ("rust-chrono" ,rust-chrono-0.4)
("rust-clap" ,rust-clap-2) ("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4)
("rust-dirs" ,rust-dirs-2.0) ("rust-gettext-rs" ,rust-gettext-rs-0.5)
("rust-gettext-rs" ,rust-gettext-rs-0.4)
("rust-gettext-sys" ,rust-gettext-sys-0.19) ("rust-gettext-sys" ,rust-gettext-sys-0.19)
("rust-lazy-static" ,rust-lazy-static-1)
("rust-libc" ,rust-libc-0.2) ("rust-libc" ,rust-libc-0.2)
("rust-libz-sys" ,rust-libz-sys-1)
("rust-natord" ,rust-natord-1.0) ("rust-natord" ,rust-natord-1.0)
("rust-nom" ,rust-nom-5) ("rust-nom" ,rust-nom-5)
("rust-once-cell" ,rust-once-cell-1) ("rust-once-cell" ,rust-once-cell-1)
("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-rand" ,rust-rand-0.7)
("rust-rand" ,rust-rand-0.6)
("rust-smallvec" ,rust-smallvec-0.6)
("rust-url" ,rust-url-2) ("rust-url" ,rust-url-2)
("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-xdg" ,rust-xdg-2.2)) ("rust-xdg" ,rust-xdg-2.2))
@ -119,6 +110,11 @@ (define-public newsboat
(delete-file-recursively (delete-file-recursively
(string-append vendor-dir "/" ,name "-" ,version ".tar.xz")) (string-append vendor-dir "/" ,name "-" ,version ".tar.xz"))
#t)) #t))
(add-after 'unpack 'patch-source
(lambda _
(substitute* "Makefile"
(("Cargo.lock") ""))
#t))
(replace 'build (replace 'build
(lambda* args (lambda* args
((assoc-ref gnu:%standard-phases 'build) ((assoc-ref gnu:%standard-phases 'build)