Unverified Commit e67477b7 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

git-branchless: fix fetchCargoVendor path, add version check, fix license (#503055)

parents 819510b4 4400f002

pkgs/by-name/gi/git-branchless/package.nix

+10 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
  rustPlatform,

  sqlite,

  stdenv,

  versionCheckHook,

}:



rustPlatform.buildRustPackage (finalAttrs: {
@@ -30,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  # - https://github.com/facebook/sapling/commit/9e27acb84605079bf4e305afb637a4d6801831ac

  postPatch = ''

    (

      cd ../git-branchless-*-vendor/esl01-indexedlog-*/

      cd $cargoDepsCopy/*/esl01-indexedlog-*/

      patch -p1 < ${./fix-esl01-indexedlog-for-rust-1_89.patch}

    )

  '';
@@ -67,10 +68,17 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    "--skip=test_switch_auto_switch_interactive"

  ];



  nativeInstallCheckInputs = [ versionCheckHook ];

  versionCheckProgramArg = "--version";

  doInstallCheck = true;



  meta = {

    description = "Suite of tools to help you visualize, navigate, manipulate, and repair your commit history";

    homepage = "https://github.com/arxanas/git-branchless";

    license = lib.licenses.gpl2Only;

    license = [

      lib.licenses.asl20

      lib.licenses.mit

    ];

    mainProgram = "git-branchless";

    maintainers = with lib.maintainers; [

      nh2