claude-mergetool: init at 1.1.0

[`claude-mergetool`][1] is exactly what it sounds like: a git/jj
conflict resolution tool which resolves conflicts by asking Claude to
resolve the conflicts. It works very well if someone else is paying your
Claude bill.

[1]: https://github.com/9999years/claude-mergetool
This commit is contained in:
Rebecca Turner
2026-02-26 10:11:23 -08:00
parent 89b61a4c82
commit 42d4a7df92
@@ -0,0 +1,38 @@
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
versionCheckHook,
}:
let
version = "1.1.0";
in
rustPlatform.buildRustPackage {
pname = "claude-mergetool";
inherit version;
src = fetchFromGitHub {
owner = "9999years";
repo = "claude-mergetool";
tag = "v${version}";
hash = "sha256-MqAtr7SxbarllzDgOWvzUooiRNf08aAVaLdZHJzMnRI=";
};
cargoHash = "sha256-RawDKKx+O79+TnLZRdatEcNDd4vLzTqHF2w1/D5zPjA=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
versionCheckProgram = "${placeholder "out"}/bin/claude-mergetool";
meta = {
homepage = "https://github.com/9999years/claude-mergetool";
changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}";
description = "Resolve Git/jj merge conflicts automatically with claude-code";
license = [ lib.licenses.mit ];
maintainers = [ lib.maintainers._9999years ];
mainProgram = "claude-mergetool";
};
passthru.updateScript = nix-update-script { };
}