From c39f71166297c40e5844e1e84d334ae659fa60d9 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Wed, 18 Feb 2026 09:44:11 -0800 Subject: [PATCH] =?UTF-8?q?chore:=20update=20beads=200.49.6=E2=86=920.52.0?= =?UTF-8?q?=20and=20gastown,=20make=20gastown=20a=20proper=20flake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - beads: update to 0.52.0 (16af00d7), refresh vendorHash - gastown: update to 35157d02, remove flake=false now that upstream has flake.nix - gastown: add inputs.nixpkgs.follows and inputs.beads.follows to deduplicate deps - Clean up stale comments Co-Authored-By: Claude Opus 4.6 (1M context) --- flake.lock | 59 +++++++++++++++++++++++++----- flake.nix | 5 ++- home/roles/development/default.nix | 12 +++--- packages/beads/default.nix | 6 +-- 4 files changed, 60 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 7720b3d..c04fb7b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1770711800, - "narHash": "sha256-A7S9C5NBhrmf60wxEZiWTOn07eUPEk1d75LixLDedc0=", + "lastModified": 1771401137, + "narHash": "sha256-RarPa2n2mTd3LhXM+cJbP9tXEUdDksqkNXVWPAQF0xw=", "owner": "steveyegge", "repo": "beads", - "rev": "6a51223b6fb59f97e699d5ac2f9a93967ca66f28", + "rev": "16af00d7576f8b4fd7bb59f54b344c8fbc6d7af4", "type": "github" }, "original": { @@ -78,14 +78,40 @@ "type": "github" } }, - "gastown": { - "flake": false, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1770789619, - "narHash": "sha256-BDtohweSxBBLM+bAouzsK6tvAo5bZPUviK/ITMIyUag=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gastown": { + "inputs": { + "beads": [ + "beads" + ], + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1771433550, + "narHash": "sha256-eRL6ry5xJDzKppYvKEBy0YAjhq9vuFG4fPcn/qWAk4w=", "owner": "steveyegge", "repo": "gastown", - "rev": "2779e30fd35c3482912b22e4be89258fe5510167", + "rev": "35157d025a7fa50622c8de619714690de6623b00", "type": "github" }, "original": { @@ -203,7 +229,7 @@ "doomemacs": "doomemacs", "emacs-overlay": "emacs-overlay", "nixpkgs": [], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1770887282, @@ -398,6 +424,21 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7a04bcc..b92fce4 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,8 @@ gastown = { url = "github:steveyegge/gastown"; - flake = false; # No flake.nix upstream yet + inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.beads.follows = "beads"; }; perles = { @@ -266,7 +267,7 @@ # Flake input packages (beads, gastown) - these get version from input rev "custom-beads" = pkgs.callPackage ./packages/beads { src = inputs.beads; - version = "0.49.6-${beadsRev}"; + version = "0.52.0-${beadsRev}"; }; "custom-gastown" = pkgs.callPackage ./packages/gastown { src = inputs.gastown; diff --git a/home/roles/development/default.nix b/home/roles/development/default.nix index 42d1b7d..b0d127b 100644 --- a/home/roles/development/default.nix +++ b/home/roles/development/default.nix @@ -5,11 +5,10 @@ with lib; let cfg = config.home.roles.development; - # Build beads from flake input with corrected vendorHash - # The upstream default.nix has stale vendorHash for commits with server mode + # Build beads from flake input beadsRev = builtins.substring 0 8 (globalInputs.beads.rev or "unknown"); - # nixpkgs ships Go 1.25.5, but beads' dolt deps require Go >= 1.25.6 + # beads' dolt deps require Go >= 1.25.6 (GOTOOLCHAIN=auto can't download in sandbox) go_1_25_6 = pkgs.go_1_25.overrideAttrs (old: rec { version = "1.25.6"; src = pkgs.fetchurl { @@ -21,12 +20,11 @@ let beadsPackage = buildGoModule_1_25_6 { pname = "beads"; - version = "0.49.6-${beadsRev}"; + version = "0.52.0-${beadsRev}"; src = globalInputs.beads; subPackages = [ "cmd/bd" ]; doCheck = false; - # Regenerated vendorHash for commit 6a51223b (dolt server mode, Go 1.25.6) - vendorHash = "sha256-9RMy0+ZBFg1BAl8Z0EuZK4XVm9QYVekS9i/1ErOIB/c="; + vendorHash = "sha256-M+JCxrKgUxCczYzMc2czLZ/JhdVulo7dH2YLTPrJVSc="; nativeBuildInputs = [ pkgs.git pkgs.pkg-config ]; buildInputs = [ pkgs.icu ]; meta = with lib; { @@ -37,7 +35,7 @@ let }; }; - # Gastown - multi-agent workspace manager (no upstream flake.nix yet) + # Gastown - multi-agent workspace manager # Source is tracked via flake input for renovate updates gastownRev = builtins.substring 0 8 (globalInputs.gastown.rev or "unknown"); gastownPackage = pkgs.buildGoModule { diff --git a/packages/beads/default.nix b/packages/beads/default.nix index 50c7e63..a6b5104 100644 --- a/packages/beads/default.nix +++ b/packages/beads/default.nix @@ -1,7 +1,6 @@ # Beads package - issue tracker for AI-supervised coding workflows # Takes src as argument so it can be called from both overlay and flake packages { lib -, stdenv , buildGoModule , fetchurl , go_1_25 @@ -13,7 +12,7 @@ }: let - # nixpkgs ships Go 1.25.5, but beads' dolt deps require Go >= 1.25.6 + # beads' dolt deps require Go >= 1.25.6 (GOTOOLCHAIN=auto can't download in sandbox) go_1_25_6 = go_1_25.overrideAttrs (old: rec { version = "1.25.6"; src = fetchurl { @@ -28,8 +27,7 @@ buildGoModule_1_25_6 { inherit version src; subPackages = [ "cmd/bd" ]; doCheck = false; - # Regenerated vendorHash for commit 6a51223b (dolt server mode, Go 1.25.6) - vendorHash = "sha256-9RMy0+ZBFg1BAl8Z0EuZK4XVm9QYVekS9i/1ErOIB/c="; + vendorHash = "sha256-M+JCxrKgUxCczYzMc2czLZ/JhdVulo7dH2YLTPrJVSc="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ icu ]; meta = with lib; {