From bdcd45a03ae3c137d9e010ea5c6fde78bd37bf89 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 24 Mar 2026 14:24:32 +0100 Subject: [PATCH 1/3] git-branchless: fix fetchCargoVendor path #387337 changed the directory layout of `cargoDeps` such that the vendored dependencies are split by dependency source (e.g., `source-git-0`, `source-git-1`, `source-registry-0`). --- pkgs/by-name/gi/git-branchless/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix index 5f0b860f9ff1..3d3e71250e5c 100644 --- a/pkgs/by-name/gi/git-branchless/package.nix +++ b/pkgs/by-name/gi/git-branchless/package.nix @@ -30,7 +30,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} ) ''; From e49ca5eb1ec80b1d7f5e97b9f677e11eef478d3a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 24 Mar 2026 14:28:13 +0100 Subject: [PATCH 2/3] git-branchless: add version check --- pkgs/by-name/gi/git-branchless/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix index 3d3e71250e5c..73959b3c026c 100644 --- a/pkgs/by-name/gi/git-branchless/package.nix +++ b/pkgs/by-name/gi/git-branchless/package.nix @@ -8,6 +8,7 @@ rustPlatform, sqlite, stdenv, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -67,6 +68,10 @@ 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"; From 4400f002e1d7475f127948473d38fbe8bcb83e5d Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Tue, 24 Mar 2026 14:34:04 +0100 Subject: [PATCH 3/3] git-branchless: fix `meta.license` https://github.com/arxanas/git-branchless/pull/841 https://github.com/arxanas/git-branchless/blob/v0.10.0/LICENSE-APACHE https://github.com/arxanas/git-branchless/blob/v0.10.0/LICENSE-MIT --- pkgs/by-name/gi/git-branchless/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-branchless/package.nix b/pkgs/by-name/gi/git-branchless/package.nix index 73959b3c026c..eb7dacea305e 100644 --- a/pkgs/by-name/gi/git-branchless/package.nix +++ b/pkgs/by-name/gi/git-branchless/package.nix @@ -75,7 +75,10 @@ rustPlatform.buildRustPackage (finalAttrs: { 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