From 75159e0e81fafc95d5cfdb7e986ef587a6a201ec Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Thu, 2 Oct 2025 21:44:50 +0200 Subject: [PATCH] envoy: fix build by using go 1.24 Filed upstream issue https://github.com/envoyproxy/envoy/issues/41337 Meanwhile we can use older Go Also FOD values got stale and needed update (https://github.com/NixOS/nixpkgs/issues/438433 is older instance of it, but got broken again) --- pkgs/by-name/en/envoy/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/en/envoy/package.nix b/pkgs/by-name/en/envoy/package.nix index a455b4620a37..738f1b5fd606 100644 --- a/pkgs/by-name/en/envoy/package.nix +++ b/pkgs/by-name/en/envoy/package.nix @@ -12,7 +12,7 @@ rustPlatform, cmake, gn, - go, + go_1_24, openjdk11_headless, ninja, patchelf, @@ -50,8 +50,8 @@ let depsHash else { - x86_64-linux = "sha256-pih2EaVFDSTaCDpqkVSt39wBFGc4MFrhc1BioeHBp+w="; - aarch64-linux = "sha256-RpgZSsDJctTzqm8M3u0+jyEi51HaNC2RZH0Hrelovo8="; + x86_64-linux = "sha256-xBSSDxvp6VjZt+Fc62/eP5Z2WWfpkAGl1Z+PupyDpg4="; + aarch64-linux = "sha256-2g8x12zkyZyjkv5NubG4bVmiLiN8uoEZ33e6Azd1guw="; } .${stdenv.system} or (throw "unsupported system ${stdenv.system}"); @@ -124,7 +124,7 @@ buildBazelPackage rec { cmake python3 gn - go + go_1_24 jdk ninja patchelf