From b747a86f8f33cd5923c65a6d15fc0978edf0a934 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sun, 22 Dec 2019 16:31:10 +0100 Subject: [PATCH] newsboat: fetch from vcs In hopes of working around https://github.com/NixOS/nixpkgs/issues/60845. This fetches a gz archive instead of xz and also fetches the archive from a different source, hopefully avoiding the issue (whatever ist is caused by). In addition to that, I think that building directly from VCS is generally cleaner and more flexible for the following reasons: - It cuts out and unnecessary middle step. - It makes sure the version users install is equal to the version users may have vetted. - It makes it easy to develop patches or bisect changes by simply checking out a different rev. - It avoids using upstream-provided "binary" artifacts like those generated by autotools. --- .../networking/feedreaders/newsboat/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 8ff8041e467b..a4b78110d334 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -1,13 +1,15 @@ -{ stdenv, rustPlatform, fetchurl, 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 }: rustPlatform.buildRustPackage rec { pname = "newsboat"; version = "2.17.1"; - src = fetchurl { - url = "https://newsboat.org/releases/${version}/${pname}-${version}.tar.xz"; - sha256 = "15qr2y35yvl0hzsf34d863n8v042v78ks6ksh5p1awvi055x5sy1"; + src = fetchFromGitHub { + owner = "newsboat"; + repo = "newsboat"; + rev = "r${version}"; + sha256 = "1xdy45rc3zzmf59zzszq9wpks6pvc0flmmwak39ww7laj2vgb4a7"; }; cargoSha256 = "0db4j6y43gacazrvcmq823fzl5pdfdlg8mkjpysrw6h9fxisq83f";