From e97dc2cd9053f08a70f4e90bf49e4a8c9dec60ed Mon Sep 17 00:00:00 2001 From: Guillaume Fournier Date: Mon, 21 Sep 2026 15:49:13 +0200 Subject: [PATCH] mdcat: 2.7.1 -> 2.17.0 --- pkgs/tools/text/mdcat/default.nix | 31 +++++++++------------------ pkgs/tools/text/mdcat/fix-clippy.diff | 14 ------------ 2 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 pkgs/tools/text/mdcat/fix-clippy.diff diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index ce735b17f17b..9292d634c8d3 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -8,24 +8,21 @@ asciidoctor, openssl, ansi2html, + less, installShellFiles, }: rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.7.1"; + version = "2.17.0"; src = fetchFromGitHub { - owner = "swsnr"; + owner = "BIRSAx2"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-j6BFXx5cyjE3+fo1gGKlqpsxrm3i9HfQ9tJGNNjjLwo="; + hash = "sha256-pBKGxMUZ9U93HmotoItxIitijZ2yMBPduBv5Ul1yQyI="; }; - patches = [ - ./fix-clippy.diff - ]; - nativeBuildInputs = [ pkg-config asciidoctor @@ -36,19 +33,11 @@ rustPlatform.buildRustPackage rec { openssl ]; - cargoHash = "sha256-8A0RLbFkh3fruZAbjJzipQvuFLchqIRovPcc6MSKdOc="; + cargoHash = "sha256-9/v33gdd9dGCdEDf53u1bKhsQGQXCBrtSe5ZvCGN1LU="; - nativeCheckInputs = [ ansi2html ]; - # 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_size_limit_is_exceeded" - "--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" + nativeCheckInputs = [ + ansi2html + less ]; postInstall = '' @@ -66,8 +55,8 @@ rustPlatform.buildRustPackage rec { meta = { description = "cat for markdown"; - homepage = "https://github.com/swsnr/mdcat"; - changelog = "https://github.com/swsnr/mdcat/releases/tag/mdcat-${version}"; + homepage = "https://github.com/BIRSAx2/mdcat"; + changelog = "https://github.com/BIRSAx2/mdcat/releases/tag/mdcat-${version}"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ SuperSandro2000 diff --git a/pkgs/tools/text/mdcat/fix-clippy.diff b/pkgs/tools/text/mdcat/fix-clippy.diff deleted file mode 100644 index d54b75ffd581..000000000000 --- a/pkgs/tools/text/mdcat/fix-clippy.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/pulldown-cmark-mdcat/src/terminal/osc.rs b/pulldown-cmark-mdcat/src/terminal/osc.rs -index 8fa2db6..dc2a2da 100644 ---- a/pulldown-cmark-mdcat/src/terminal/osc.rs -+++ b/pulldown-cmark-mdcat/src/terminal/osc.rs -@@ -20,9 +20,6 @@ pub fn write_osc(writer: &mut W, command: &str) -> Result<()> - Ok(()) - } - --#[derive(Debug, PartialEq, Eq, Copy, Clone)] --pub struct Osc8Links; -- - /// Whether the given `url` needs to get an explicit host. - /// - /// [OSC 8] links require that `file://` URLs give an explicit hostname, as