public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83190 from doronbehar/update-newsboat

Browse Source 
newsboat: 2.18 -> 2.19
This commit is contained in:
Timo Kaufmann 2020-03-25 13:11:05 +00:00 committed by GitHub
commit 2136d80fb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/networking/feedreaders/newsboat/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses { stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, Security, makeWrapper }: , asciidoctor, libiconv, Security, makeWrapper }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "newsboat"; pname = "newsboat";
version = "2.18"; version = "2.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "newsboat"; owner = "newsboat";
repo = "newsboat"; repo = "newsboat";
rev = "r${version}"; rev = "r${version}";
sha256 = "1bg2qjkzdawn4fnn0w7jhw1dk6191w8axnqra43z21pinfyim6da"; sha256 = "0yyrq8a90l6pkrczm9qvdg75jhsdq0niwp79vrdpm8rsxqpdmfq7";
}; };
cargoSha256 = "0q7bira2adfmx0ghb1c5nqz200iajaxap9bq8j5wvvk9l2wywslp"; cargoSha256 = "1q3jf3d80c0ik38qk8jgbhfz5jxv0cy3lzmkyh2l002azp9hvv59";
postPatch = '' postPatch = ''
substituteInPlace Makefile --replace "|| true" "" substituteInPlace Makefile --replace "|| true" ""
@ -21,7 +21,10 @@ rustPlatform.buildRustPackage rec {
--replace "ncurses5.4" "ncurses" --replace "ncurses5.4" "ncurses"
''; '';
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ] nativeBuildInputs = [
pkgconfig
asciidoctor
]
++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ];
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ] buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ]
@ -31,12 +34,12 @@ rustPlatform.buildRustPackage rec {
make make
''; '';
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" # TODO: Check if that's still needed
+ stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -Wno-error=format-security";
doCheck = true; doCheck = true;
checkPhase = '' preCheck = ''
make test make test
''; '';
@ -50,7 +53,7 @@ rustPlatform.buildRustPackage rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://newsboat.org/; homepage = "https://newsboat.org/";
description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console"; description = "A fork of Newsbeuter, an RSS/Atom feed reader for the text console";
maintainers = with maintainers; [ dotlambda nicknovitski ]; maintainers = with maintainers; [ dotlambda nicknovitski ];
license = licenses.mit; license = licenses.mit;