From 68f49681b67767be4c75a74d8075413b26021b57 Mon Sep 17 00:00:00 2001 From: David Wood Date: Mon, 19 Oct 2020 13:28:28 +0100 Subject: [PATCH] mdcat: 0.21.1 -> 0.22.1 --- pkgs/tools/text/mdcat/default.nix | 45 ++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 277c7417ce96..c89d1526257f 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,32 +1,47 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security, ansi2html }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, pkgconfig +, asciidoctor +, openssl +, Security +, ansi2html +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.21.1"; + version = "0.22.1"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-O7LlbSkxcyHQiTHYB/QBJVlShzTSzud3VJDIQ1ScvM4="; + hash = "sha256-4sM1xT/JQ+yM5tZkGwK7r0gUT5so9o1MnDJ7apZkRd4="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-pvhYKyFraMI4w5nq6L8qs/ONSNDTHElhZnZmD5mmAZs="; + cargoSha256 = "sha256-LoNm2/6/FgTKp95ETODY39D8Ou+9X+IXIy625YW9AFI="; checkInputs = [ ansi2html ]; - checkPhase = '' - # Skip tests that use the network and that include files. - cargo test -- \ - --skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length \ - --skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length \ - --skip magic::tests::detect_mimetype_of_png_image \ - --skip magic::tests::detect_mimetype_of_svg_image \ - --skip resources::tests::read_url_with_http_url_fails_when_status_404 \ - --skip resources::tests::read_url_with_http_url_returns_content_when_status_200 \ - --skip iterm2_tests_render_md_samples_images_md + # Skip tests that use the network and that include files. + checkFlags = [ + "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" + "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" + "--skip magic::tests::detect_mimetype_of_png_image" + "--skip magic::tests::detect_mimetype_of_svg_image" + "--skip resources::tests::read_url_with_http_url_fails_when_status_404" + "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" + "--skip iterm2_tests_render_md_samples_images_md" + ]; + + postInstall = '' + installManPage $releaseDir/build/mdcat-*/out/mdcat.1 + installShellCompletion --bash $releaseDir/build/mdcat-*/out/completions/mdcat.bash + installShellCompletion --fish $releaseDir/build/mdcat-*/out/completions/mdcat.fish + installShellCompletion --zsh $releaseDir/build/mdcat-*/out/completions/_mdcat ''; meta = with stdenv.lib; {