From 1c9931da1ed3235a481c3300d8a9f64294922850 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Wed, 10 Aug 2022 10:32:40 +0200 Subject: [PATCH] git-branchless: 0.3.12 -> 0.4.0 --- .../git-and-tools/git-branchless/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 0b7446b7ddab..902211ef3d7f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.12"; + version = "0.4.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-1bUHltONLfJumkxPnzGJFMMyS02LVqjpDL+KgiewyoQ="; + sha256 = "sha256-WFrN5TRFr9xHBUawTfvri0qlTiWCfAeC5SL+T6mwlU0="; }; - cargoSha256 = "sha256-3+ULHqtKAhf4AdoLPK/3IqnfOcskoh6ctlQnY1oTHJ8="; + cargoSha256 = "sha256-AGW1jUKPc5iiuDlgIDHG1sOn1flAB3UdxJJNKPH5+f8="; nativeBuildInputs = [ pkg-config ]; @@ -48,15 +48,6 @@ rustPlatform.buildRustPackage rec { "--skip=test_next_ambiguous_interactive" ]; - # Fixed in next release - patches = [ - (fetchpatch { - url = "https://github.com/arxanas/git-branchless/commit/8bed1e83495a448f479103d2d4b75745aa512667.patch"; - sha256 = "sha256-bFfXBYxfgx1TxlJ+/2Gh9WsgL2vCJKwwbq4JD8/2c1w="; - name = "fix-tests-for-latest-git"; - }) - ]; - meta = with lib; { description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; homepage = "https://github.com/arxanas/git-branchless";