From cc4da379917810b2f0708011e55ed4cd6c205577 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 3 Feb 2023 10:33:25 -0500 Subject: [PATCH] difftastic: 0.42.0 -> 0.43.0 Diff: https://github.com/Wilfred/difftastic/compare/0.42.0...0.43.0 Changelog: https://github.com/Wilfred/difftastic/blob/0.43.0/CHANGELOG.md --- pkgs/tools/text/difftastic/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index 9d189f40fb06..40ddc9263e8c 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -1,21 +1,20 @@ { lib +, rustPlatform , fetchFromGitHub , fetchpatch -, rustPlatform -, tree-sitter -, difftastic , testers +, difftastic }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-9ooVXGZ7MEB4D0awciJJio3ttqxEQ8EUBbIQ6xxrXh0="; + sha256 = "sha256-YL2rKsP5FSoG1gIyxQtt9kovBAyu8Flko5RxXRQy5mQ="; }; depsExtraArgs = { @@ -40,14 +39,20 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-Zbnk5tcCRoaEH3A1mbsfpEhLe1EMcZqPQ4vzWxi0oG0="; + cargoSha256 = "sha256-SUNBnJP8B/HvlozcCbehL1A2/WudYE20DIPc7/fYF/k="; + + checkFlags = [ + # test is broken + # https://github.com/Wilfred/difftastic/issues/479 + "--skip=files::tests::test_gzip_is_binary" + ]; passthru.tests.version = testers.testVersion { package = difftastic; }; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; - changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 figsoda ]; mainProgram = "difft";