summaryrefslogtreecommitdiff
path: root/gnu/packages/syndication.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-06-19 17:38:47 +0200
committerMarius Bakke <marius@gnu.org>2021-06-19 17:38:47 +0200
commit6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch)
tree2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/syndication.scm
parent6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff)
parentdece03e2b98fc1c2428c2448ce5792f813eb79bf (diff)
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/syndication.scm')
-rw-r--r--gnu/packages/syndication.scm23
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index 7ec2435522..de106e1882 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -52,6 +52,7 @@
#:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages rust)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
@@ -218,15 +219,14 @@ cards.")
(define-public newsboat
(package
(name "newsboat")
- (version "2.22.1")
+ (version "2.23")
(source
(origin
(method url-fetch)
(uri (string-append "https://newsboat.org/releases/" version
"/newsboat-" version ".tar.xz"))
(sha256
- (base32
- "1476fmfw2hkrjwyr3f7k9316lzwnn2b1dbc51rybcxipqlfg8849"))))
+ (base32 "1p6sqypgzhwirgljr898c9n7vr5y9322fvrlaigwrchxshwv35xr"))))
(build-system cargo-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -246,6 +246,7 @@ cards.")
(guix build utils)
((guix build gnu-build-system) #:prefix gnu:))
#:vendor-dir "vendor"
+ #:rust ,rust-1.46 ; or newer
#:install-source? #f
#:cargo-inputs
(("rust-backtrace" ,rust-backtrace-0.3)
@@ -254,17 +255,19 @@ cards.")
("rust-clap" ,rust-clap-2)
("rust-curl-sys" ,rust-curl-sys-0.4)
("rust-cxx" ,rust-cxx-0.5)
- ("rust-cxx-build" ,rust-cxx-build-0.5)
- ("rust-gettext-rs" ,rust-gettext-rs-0.5)
+ ("rust-gettext-rs" ,rust-gettext-rs-0.6)
("rust-libc" ,rust-libc-0.2)
("rust-natord" ,rust-natord-1)
("rust-nom" ,rust-nom-6)
("rust-once-cell" ,rust-once-cell-1)
- ("rust-rand" ,rust-rand-0.7)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
+ ("rust-rand" ,rust-rand-0.8)
("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))
#:cargo-development-inputs
- (("rust-tempfile" ,rust-tempfile-3)
+ (("rust-cxx-build" ,rust-cxx-build-0.5)
+ ("rust-tempfile" ,rust-tempfile-3)
("rust-proptest" ,rust-proptest-0.9)
("rust-section-testing" ,rust-section-testing-0.0))
#:phases
@@ -566,14 +569,14 @@ formats, including all versions of RSS and Atom.")
("qttools" ,qttools)))
(inputs
`(("qtwebkit" ,qtwebkit)
- ("qtbase" ,qtbase)
+ ("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
("phonon" ,phonon)
("sqlite" ,sqlite)))
(home-page "https://quiterss.org/")
(synopsis "RSS/Atom news feeds reader written on Qt/C++")
(description "QuiteRSS is an RSS/Atom news feeds reader written on Qt/C++
-that aims to be quite fast and comfortable to it's user.")
+that aims to be quite fast and comfortable to its user.")
(license license:gpl3+)))
(define-public gfeeds