Unverified Commit 47626c90 authored by Sefa Eyeoglu's avatar Sefa Eyeoglu Committed by GitHub
Browse files

git-branchless: 0.9.0 -> 0.10.0 & fix build (#342278)

parents 5d7710b4 8d7be6e3

pkgs/applications/version-management/git-branchless/default.nix

+13 −5
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "git-branchless";

  version = "0.9.0";

  version = "0.10.0";



  src = fetchFromGitHub {

    owner = "arxanas";

    repo = "git-branchless";

    rev = "v${version}";

    hash = "sha256-4RRSffkAe0/8k4SNnlB1iiaW4gWFTuYXplVBj2aRIdU=";

    hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";

  };



  cargoHash = "sha256-Jg4d7tJXr2O1sEDdB/zk+7TPBZvgHlmW8mNiXozLKV8=";

  cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8=";



  nativeBuildInputs = [ pkg-config ];
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { 
      libiconv

    ];



  postInstall = ''

  postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) ''

    $out/bin/git-branchless install-man-pages $out/share/man

  '';
@@ -48,8 +48,15 @@ rustPlatform.buildRustPackage rec { 
    export TEST_GIT=${git}/bin/git

    export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path)

  '';

  # FIXME: these tests deadlock when run in the Nix sandbox



  # Note that upstream has disabled CI tests for git>=2.46

  # See: https://github.com/arxanas/git-branchless/issues/1416

  #      https://github.com/arxanas/git-branchless/pull/1417

  # To be re-enabled once arxanas/git-branchless#1416 is resolved

  doCheck = false;



  checkFlags = [

    # FIXME: these tests deadlock when run in the Nix sandbox

    "--skip=test_switch_pty"

    "--skip=test_next_ambiguous_interactive"

    "--skip=test_switch_auto_switch_interactive"
@@ -63,6 +70,7 @@ rustPlatform.buildRustPackage rec { 
    maintainers = with maintainers; [

      nh2

      hmenke

      bryango

    ];

  };

}