Unverified Commit 9727e904 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #201469 from hmenke/git-branchless

git-branchless: 0.5.1 -> 0.6.0
parents 668fd70a 3261d904
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@

rustPlatform.buildRustPackage rec {
  pname = "git-branchless";
  version = "0.5.1";
  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "arxanas";
    repo = "git-branchless";
    rev = "v${version}";
    sha256 = "sha256-xh+G9bKEL2ho1YrNVTLbCTxSWZtjEuEWutvYEFr2G/g=";
    sha256 = "sha256-Rf7ai+s2Fp/RFA4on9YBoTjFpvzSZtAHf0rytfZf0rc=";
  };

  cargoSha256 = "sha256-Zz1RQ/mhdIbPiw2StGtTiORXiJ2nVLyZakt1072ha6U=";
  cargoSha256 = "sha256-GVo0t2dJ6R+1UJf/NlKd5QLIQfDdFEHa+FSeW/Hk/4c=";

  nativeBuildInputs = [ pkg-config ];

@@ -43,8 +43,9 @@ rustPlatform.buildRustPackage rec {
  '';
  # FIXME: these tests deadlock when run in the Nix sandbox
  checkFlags = [
    "--skip=test_checkout_pty"
    "--skip=test_switch_pty"
    "--skip=test_next_ambiguous_interactive"
    "--skip=test_switch_auto_switch_interactive"
  ];

  meta = with lib; {