about summary refs log tree commit diff
path: root/third_party/josh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-07-02T12·20+0300
committertazjin <tazjin@tvl.su>2023-07-02T16·38+0000
commit3a2035c8b920279d7ccc7d7ab0954bb4ae0a0c4a (patch)
tree2dddde4e92ac57cfadf356e17e05817ed4d262d5 /third_party/josh
parentd6de1137783b0b42eed7206790cc43477ebf249c (diff)
fix(3p/josh): build with Rust 1.69.0 exactly r/6387
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 <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party/josh')
-rw-r--r--third_party/josh/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix
index a4a5d8ebf9..ce472b32c2 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}";