From c9fa7cf8b71b56ea1c9d1e438ab1847c85d44ffc Mon Sep 17 00:00:00 2001 From: matt wilkie Date: Sat, 25 Apr 2026 14:45:40 -0700 Subject: [PATCH] fix(nix): use proxy vendor for pure-go package (bd-9ok) Build the Nix package with the existing gms_pure_go tag while using proxyVendor to avoid stale vendor/modules.txt consistency checks. Remove the leftover ICU flake wiring and debug env dump from postPatch. Based on the focused Nix changes from gastownhall/beads#3278. Co-authored-by: Patrick Stallings Co-authored-by: Claude Sonnet 4.6 --- default.nix | 8 ++++---- flake.nix | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/default.nix b/default.nix index 9384f0a9e..cd17484b2 100644 --- a/default.nix +++ b/default.nix @@ -16,16 +16,16 @@ buildGoModule { tags = [ "gms_pure_go" ]; doCheck = false; - # Go module dependencies hash - if build fails with hash mismatch, update with the "got:" value - vendorHash = "sha256-Rn1MnasYUOBbIgjFx0E6R2Zak6la1VajDkHqoiFpHtw="; + # proxyVendor avoids vendor/modules.txt consistency checks when the vendored + # tree lags go.mod/go.sum. + proxyVendor = true; + vendorHash = "sha256-S/NavjGH6VSPU+rCtqtviOcGhgXc6VZUXCUhasSdUGU="; # Relax go.mod version for Nix: nixpkgs Go may lag behind the latest # patch release, and GOTOOLCHAIN=auto can't download in the Nix sandbox. postPatch = '' goVer="$(go env GOVERSION | sed 's/^go//')" go mod edit -go="$goVer" - - env ''; # Allow patch-level toolchain upgrades when a dependency's minimum Go patch diff --git a/flake.nix b/flake.nix index f81a0273a..51fd74b58 100644 --- a/flake.nix +++ b/flake.nix @@ -30,8 +30,7 @@ } ); in rec { - icu = nixpkgs.icu77; - packages = forAllSystems (args: import ./packages.nix (args // { inherit icu; })); + packages = forAllSystems (args: import ./packages.nix args); apps = forAllSystems ( { self, system, ... }: