Skip to content

Commit ae0fc1d

Browse files
authored
fix(nix): use proxy vendor for pure-go package
Build the Nix package with the existing gms_pure_go tag while using proxyVendor to avoid stale vendor/modules.txt consistency checks. Remove leftover ICU flake wiring and the debug env dump from postPatch. Based on the focused Nix changes from #3278; contributor attribution preserved in c9fa7cf. Closes bd-9ok
1 parent 2cd8864 commit ae0fc1d

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

default.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ buildGoModule {
1616
tags = [ "gms_pure_go" ];
1717
doCheck = false;
1818

19-
# Go module dependencies hash - if build fails with hash mismatch, update with the "got:" value
20-
vendorHash = "sha256-Rn1MnasYUOBbIgjFx0E6R2Zak6la1VajDkHqoiFpHtw=";
19+
# proxyVendor avoids vendor/modules.txt consistency checks when the vendored
20+
# tree lags go.mod/go.sum.
21+
proxyVendor = true;
22+
vendorHash = "sha256-S/NavjGH6VSPU+rCtqtviOcGhgXc6VZUXCUhasSdUGU=";
2123

2224
# Relax go.mod version for Nix: nixpkgs Go may lag behind the latest
2325
# patch release, and GOTOOLCHAIN=auto can't download in the Nix sandbox.
2426
postPatch = ''
2527
goVer="$(go env GOVERSION | sed 's/^go//')"
2628
go mod edit -go="$goVer"
27-
28-
env
2929
'';
3030

3131
# Allow patch-level toolchain upgrades when a dependency's minimum Go patch

flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
}
3131
);
3232
in rec {
33-
icu = nixpkgs.icu77;
34-
packages = forAllSystems (args: import ./packages.nix (args // { inherit icu; }));
33+
packages = forAllSystems (args: import ./packages.nix args);
3534

3635
apps = forAllSystems (
3736
{ self, system, ... }:

0 commit comments

Comments
 (0)