From dcd65ebe7fdcf6a995eeacc5b689bff1b311d436 Mon Sep 17 00:00:00 2001 From: defangdevs Date: Wed, 19 Aug 2026 16:17:54 -0700 Subject: [PATCH] fix(nix): bump nixpkgs pin so buildGo125Module satisfies go.mod's go 1.25.9 github.com/moby/buildkit v0.31.1 (bumped by dependabot in #2224) requires go >= 1.25.9 in its own go.mod, which raised our module's go directive to 1.25.9 too. The nixpkgs revision pinned in flake.lock only shipped go_1_25 1.25.5, so the nix-shell-test CI job failed on every PR/push to main with "go.mod requires go >= 1.25.9 (running go 1.25.5; GOTOOLCHAIN=local)" before it ever got far enough to check the vendor hash. Update the nixpkgs pin to a revision that ships go_1_25 1.25.13, and update the resulting vendorHash for the go.sum changes from the buildkit bump. Verified locally with `nix build .#defang-cli`. --- flake.lock | 11 +++++------ pkgs/defang/cli.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 97a11dc77..5063d8b31 100644 --- a/flake.lock +++ b/flake.lock @@ -19,12 +19,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767364772, - "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", - "type": "github" + "lastModified": 1787111413, + "narHash": "sha256-93GX5Q/npwBE92xpHlktxgGztuIP/2kwOMukz+qyJBk=", + "rev": "afe3d8ac4395617bdcdac9f188ac8717a062e014", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1057999.afe3d8ac4395/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", diff --git a/pkgs/defang/cli.nix b/pkgs/defang/cli.nix index 4e8e44f49..0d31419c2 100644 --- a/pkgs/defang/cli.nix +++ b/pkgs/defang/cli.nix @@ -7,7 +7,7 @@ buildGo125Module { pname = "defang-cli"; version = "git"; src = lib.cleanSource ../../src; - vendorHash = "sha256-3NYtGGBZ13Ln9sGrvJGs4l3dx7ZsNIysku9yfcVik5Q="; + vendorHash = "sha256-QMQ7rH76stxpN7EjY3l9HOBusOQp85dt+0Fkn9sO7Xk="; subPackages = [ "cmd/cli" ];