mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 23:36:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: newsboat: Update package style.

Browse source 
* gnu/packages/syndication.scm (newsboat)[native-inputs]: Remove input
labels.
[arguments]: Use g-exps.  Remove input labels from cargo-inputs,
cargo-development-inputs.

Change-Id: Ie9c2029f593c3af2eb22f74be0d63524448d43b7
This commit is contained in:
Efraim Flashner 2024-12-19 12:33:21 +02:00
parent ac3a3e508c
commit 30e5769a21
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 71 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
gnu/packages/syndication.scm
View file

@ -247,13 +247,14 @@ (define-public newsboat
(base32 "0z57zc70gqac2vk6hlv4ijql3nrn0dzi1w8drvl9any2hnixwm2g"))))
(build-system cargo-build-system)
(native-inputs
`(("gettext" ,gettext-minimal)
("openssl" ,openssl)
("pkg-config" ,pkg-config)
(append
(list gettext-minimal
openssl
pkg-config)
;; For building documentation.
,@(if (supported-package? ruby-asciidoctor)
`(("asciidoctor" ,ruby-asciidoctor))
`())))
(if (supported-package? ruby-asciidoctor)
(list ruby-asciidoctor)
'())))
(inputs
(list curl
json-c
@ -262,48 +263,49 @@ (define-public newsboat
stfl
sqlite))
(arguments
`(#:modules ((guix build cargo-build-system)
(list
#:modules '((guix build cargo-build-system)
(guix build utils)
((guix build gnu-build-system) #:prefix gnu:))
#:install-source? #f
#:cargo-inputs
(("rust-backtrace" ,rust-backtrace-0.3)
("rust-bitflags" ,rust-bitflags-2)
("rust-chrono" ,rust-chrono-0.4)
("rust-curl-sys" ,rust-curl-sys-0.4)
("rust-cxx" ,rust-cxx-1)
("rust-cxx-build" ,rust-cxx-build-1)
("rust-fastrand" ,rust-fastrand-2)
("rust-gettext-rs" ,rust-gettext-rs-0.7)
("rust-httpmock" ,rust-httpmock-0.7)
("rust-lexopt" ,rust-lexopt-0.3)
("rust-libc" ,rust-libc-0.2)
("rust-md5" ,rust-md5-0.7)
("rust-natord" ,rust-natord-1)
("rust-nom" ,rust-nom-7)
("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-url" ,rust-url-2)
("rust-unicode-width" ,rust-unicode-width-0.1)
("rust-unicode-segmentation" ,rust-unicode-segmentation-1)
("rust-xdg" ,rust-xdg-2))
(list rust-backtrace-0.3
rust-bitflags-2
rust-chrono-0.4
rust-curl-sys-0.4
rust-cxx-1
rust-cxx-build-1
rust-fastrand-2
rust-gettext-rs-0.7
rust-httpmock-0.7
rust-lexopt-0.3
rust-libc-0.2
rust-md5-0.7
rust-natord-1
rust-nom-7
rust-percent-encoding-2
rust-url-2
rust-unicode-width-0.1
rust-unicode-segmentation-1
rust-xdg-2)
#:cargo-development-inputs
(("rust-tempfile" ,rust-tempfile-3)
("rust-proptest" ,rust-proptest-1)
("rust-section-testing" ,rust-section-testing-0.0.5))
(list rust-tempfile-3
rust-proptest-1
rust-section-testing-0.0.5)
#:phases
(modify-phases %standard-phases
,@(if (not (assoc-ref inputs "asciidoctor"))
`((add-after 'unpack 'dont-use-asciidoctor
#~(modify-phases %standard-phases
#$@(if (not (this-package-native-input "asciidoctor"))
#~((add-after 'unpack 'dont-use-asciidoctor
(lambda _
(substitute* "config.sh"
((".*asciidoctor.*") ""))
(substitute* "Makefile"
(("^doc:.*") "doc:\n")
(("install-podboat install-docs") "install-podboat")))))
'())
#~())
(add-after 'unpack 'pre-build
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CXX" ,(cxx-for-target))
(setenv "CXX" #$(cxx-for-target))
(setenv "CXX_FOR_BUILD" (which "g++"))
(substitute* "config.sh"
(("if curl-config")
@ -313,7 +315,7 @@ (define-public newsboat
(lambda* (#:key vendor-dir #:allow-other-keys)
;; Don't keep the whole tarball in the vendor directory
(delete-file-recursively
(string-append vendor-dir "/" ,name "-" ,version ".tar.xz"))))
(string-append vendor-dir "/" #$name "-" #$version ".tar.xz"))))
(add-after 'unpack 'patch-source
(lambda* (#:key outputs #:allow-other-keys)
(substitute* "Makefile"