From 31dc62c3afd7cef1cd623345af9e774cf5c601d9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 28 Jun 2023 11:19:17 -0400 Subject: [PATCH] snazy: 0.50.0 -> 0.51.2 Diff: https://github.com/chmouel/snazy/compare/0.50.0...0.51.2 Changelog: https://github.com/chmouel/snazy/releases/tag/0.51.2 --- pkgs/development/tools/snazy/default.nix | 27 ++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index 4dbd230d563b..d7c5f4d7ceee 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -1,17 +1,32 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib +, rustPlatform +, fetchFromGitHub +, fetchpatch +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.50.0"; + version = "0.51.2"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - sha256 = "sha256-wSRIJF2XPJvzmxuGbuPYPFgn9Eap3vqHT1CM/oQy8vM="; + hash = "sha256-k8dcALE5+5kqNKhmiLT0Ir8SRYOIp8eV3a/xYWrKpNw="; }; - cargoSha256 = "sha256-IGZZEyy9IGqkpsbnOzLdBSFbinZ7jhH2LWub/+gP89E="; + cargoHash = "sha256-mBA2BhGeYR57UrqI1qtByTkTocMymjCWlWhh4+Ko8wY="; + + cargoPatches = [ + # update Cargo.toml to fix the version + # https://github.com/chmouel/snazy/pull/178 + (fetchpatch { + name = "update-version-in-cargo-toml.patch"; + url = "https://github.com/chmouel/snazy/commit/4fd92c7336f51d032a0baf60fd5ab8c1056ad14f.patch"; + hash = "sha256-WT/HHB9HB+X/L5FZdvQAG8K7PrYHQD8F5aWQVaMJuIU="; + }) + ]; nativeBuildInputs = [ installShellFiles ]; @@ -31,13 +46,13 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - homepage = "https://github.com/chmouel/snazy/"; - changelog = "https://github.com/chmouel/snazy/releases/tag/v${version}"; description = "A snazzy json log viewer"; longDescription = '' Snazy is a simple tool to parse json logs and output them in a nice format with nice colors. ''; + homepage = "https://github.com/chmouel/snazy/"; + changelog = "https://github.com/chmouel/snazy/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ figsoda jk ]; };