Merge pull request #148707 from hmenke/git-branchless

git-branchless: 0.3.7 -> 0.3.8

authored by figsoda and committed by GitHub 4722a8e1 7a3e80ab

+8 -3
+8 -3
pkgs/applications/version-management/git-and-tools/git-branchless/default.nix
··· 15 15 16 16 rustPlatform.buildRustPackage rec { 17 17 pname = "git-branchless"; 18 - version = "0.3.7"; 18 + version = "0.3.8"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "arxanas"; 22 22 repo = "git-branchless"; 23 23 rev = "v${version}"; 24 - sha256 = "sha256-knRRjTjnhpedcQTVpJnBsrnaeRbjZ2i3aABeE0LrQ+c="; 24 + sha256 = "sha256-eDVC1tvAkCioV0Mi5f/Qkc0MMTNaoFXuvWXpllZ7PgE="; 25 25 }; 26 26 27 - cargoSha256 = "sha256-NyzsY5d4iC3zMSzmh9Qmd211oT6lmhUdvIfQdnzrtok="; 27 + cargoSha256 = "sha256-wtG/WTmZ13jxIawI9j9QKQm7jPx5TUs7MjqX+lq/Vf0="; 28 28 29 29 nativeBuildInputs = [ pkg-config ]; 30 30 ··· 42 42 export PATH_TO_GIT=${git}/bin/git 43 43 export GIT_EXEC_PATH=$(${git}/bin/git --exec-path) 44 44 ''; 45 + # FIXME: these tests deadlock when run in the Nix sandbox 46 + checkFlags = [ 47 + "--skip=test_checkout_pty" 48 + "--skip=test_next_ambiguous_interactive" 49 + ]; 45 50 46 51 meta = with lib; { 47 52 description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history";