From 3a2035c8b920279d7ccc7d7ab0954bb4ae0a0c4a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 2 Jul 2023 15:20:17 +0300 Subject: fix(3p/josh): build with Rust 1.69.0 exactly As a workaround for b/283, we are downgrading the version of Rust used to build josh as a strange issue causing invalid memory allocation requests occurs with Rust 1.70.0 Change-Id: I94476077eb4a8cebb82f55c20397c299ff57c0a4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8917 Reviewed-by: sterni Tested-by: BuildkiteCI Autosubmit: tazjin --- third_party/josh/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix index a4a5d8ebf9ed..ce472b32c20b 100644 --- a/third_party/josh/default.nix +++ b/third_party/josh/default.nix @@ -10,8 +10,15 @@ let inherit rev; hash = "sha256:0rsf65fq9xm3qj77ig3s4wmmgm50jhvwrknr839hipjj5lj4x1hp"; }; + + + rust169 = depot.third_party.nixpkgs.rust-bin.stable."1.69.0".default; + naersk = pkgs.callPackage depot.third_party.sources.naersk { + rustc = rust169; + cargo = rust169; + }; in -depot.third_party.naersk.buildPackage { +naersk.buildPackage { inherit src; JOSH_VERSION = "git-${builtins.substring 0 8 rev}"; -- cgit 1.4.1