diff --git a/home/roles/development/default.nix b/home/roles/development/default.nix index 9242a59..63f5821 100644 --- a/home/roles/development/default.nix +++ b/home/roles/development/default.nix @@ -8,15 +8,27 @@ let # Build beads from flake input with corrected vendorHash # The upstream default.nix has stale vendorHash for commits with server mode beadsRev = builtins.substring 0 8 (globalInputs.beads.rev or "unknown"); - beadsPackage = pkgs.buildGoModule { + + # nixpkgs ships Go 1.25.5, but beads' dolt deps require Go >= 1.25.6 + go_1_25_6 = pkgs.go_1_25.overrideAttrs (old: rec { + version = "1.25.6"; + src = pkgs.fetchurl { + url = "https://go.dev/dl/go${version}.src.tar.gz"; + hash = "sha256-WMv3ceRNdt5vVtGeM7d9dFoeSJNAkih15GWFuXXCsFk="; + }; + }); + buildGoModule_1_25_6 = pkgs.buildGoModule.override { go = go_1_25_6; }; + + beadsPackage = buildGoModule_1_25_6 { pname = "beads"; - version = "0.49.1-${beadsRev}"; + version = "0.49.6-${beadsRev}"; src = globalInputs.beads; subPackages = [ "cmd/bd" ]; doCheck = false; - # Regenerated vendorHash for commit 93965b4a (has dolt server mode, Go 1.24) - vendorHash = "sha256-gwxGv8y4+1+k0741CnOYcyJPTJ5vTrynqPoO8YS9fbQ="; - nativeBuildInputs = [ pkgs.git ]; + # Regenerated vendorHash for commit 6a51223b (dolt server mode, Go 1.25.6) + vendorHash = "sha256-9RMy0+ZBFg1BAl8Z0EuZK4XVm9QYVekS9i/1ErOIB/c="; + nativeBuildInputs = [ pkgs.git pkgs.pkg-config ]; + buildInputs = [ pkgs.icu ]; meta = with lib; { description = "beads (bd) - An issue tracker designed for AI-supervised coding workflows"; homepage = "https://github.com/steveyegge/beads"; @@ -52,8 +64,6 @@ let ./gastown-fix-validate-recipient.patch # Fix agentBeadToAddress to use title field for hq- prefixed beads ./gastown-fix-agent-bead-address-title.patch - # Fix crew/polecat home paths: remove incorrect /rig suffix - ./gastown-fix-role-home-paths.patch # Fix town root detection: don't map to Mayor (causes spurious mismatch warnings) ./gastown-fix-town-root-detection.patch # Statusline optimization: skip expensive beads queries for detached sessions