From 57cf952ea98db70fcf50ec31e1c1057562b0a1df Mon Sep 17 00:00:00 2001 From: sterni Date: Sun, 30 Oct 2022 22:28:02 +0100 Subject: chore(3p/sources): Bump channels & overlays (OpenSSL edition) * //ops/machines/whitby: Disable grafana, since the grafana module was changed upstream in a way that our configuration no longer works. Since the OpenSSL security update is relatively pressing, adapting the grafana configuration beforehand is not a hard requirement. See https://github.com/NixOS/nixpkgs/pull/191768. * //tools/depotfmt: keep Go at version 1.18 to forgo a reformat of the tree. * //nix/buildGo: keep Go at version 1.18, as 1.19 changed the CLI interface (?) in a way that breaks buildGo. * //3p/overlays/tvl: drop upstreamed tdlib upgrade. * //3p/overlays/tvl: patch buf to work around breakage due to git 2.38.1 TODO items for Go are tracked in b/215. Change-Id: Ie08fef49cf3db12e6b5225a8b992a990ddc5b642 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7141 Tested-by: BuildkiteCI Autosubmit: sterni Reviewed-by: grfn Reviewed-by: tazjin --- nix/buildGo/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nix/buildGo') diff --git a/nix/buildGo/default.nix b/nix/buildGo/default.nix index 92951b3cb2..97b8bd2264 100644 --- a/nix/buildGo/default.nix +++ b/nix/buildGo/default.nix @@ -22,7 +22,10 @@ let replaceStrings toString; - inherit (pkgs) lib go runCommand fetchFromGitHub protobuf symlinkJoin; + inherit (pkgs) lib runCommand fetchFromGitHub protobuf symlinkJoin; + + # TODO: Adapt to Go 1.19 changes + go = pkgs.go_1_18; # Helpers for low-level Go compiler invocations spaceOut = lib.concatStringsSep " "; -- cgit 1.4.1