diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 81870cd492f..31f86098a0b 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -8,30 +8,19 @@ , libiconv , installShellFiles , makeWrapper -, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xkGGnWjuZ5ZR4Ll+JwgWyKZFboFZ6HKA8GviR3YBAnM="; + hash = "sha256-cGHxB3Wp8yEcJBMtSOec6l7iBsMLhUtJ7nh5fijnWZs="; }; - cargoSha256 = "sha256-ye6GH4pcI9h1CNpobUzfJ+2WlqJ98saCdD77AtSGafg="; - - cargoPatches = [ - # merged upstream in https://github.com/sharkdp/bat/pull/2399 - (fetchpatch { - name = "disable-completion-of-cache-subcommand.patch"; - url = "https://github.com/sharkdp/bat/commit/b6b9d3a629bd9b08725df2a4e7b92c3023584a89.patch"; - hash = "sha256-G4LajO09+qfhpr+HRvAHCuE9EETit2e16ZEyAtz26B4="; - excludes = [ "CHANGELOG.md" ]; - }) - ]; + cargoHash = "sha256-wZNdYGCLKD80gV1QUTgKsFSNYkbDubknPB3e6dsyEgs="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ];