diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-02-03 19:14:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 19:14:09 -0300 |
| commit | cab588077cc8914f6b15f3225c140d855b2ed68d (patch) | |
| tree | ec744de3537d090e4a83f3b94aa92064c99bc509 /pkgs/tools | |
| parent | f3b37396bdcf0975111fd41ad7863fbbe13ec385 (diff) | |
| parent | cc4da379917810b2f0708011e55ed4cd6c205577 (diff) | |
Merge pull request #214381 from figsoda/difftastic
difftastic: 0.42.0 -> 0.43.0
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/text/difftastic/default.nix | 19 |
1 files 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"; |