From 8222b40d66c41bfe5f661c43ed3ed4ddce3f93e6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 9 Oct 2023 16:03:06 +0200 Subject: [PATCH] chore(third_party/josh): bump to latest HEAD It seems our currently pinned josh commit doesn't seem to support pushing back, and just timeouts when trying to do so. Bump to the latest head, let's see how it works out there. We don't need to pull a more recent rustc, as the nixpkgs rustc seems to be recent enough. Change-Id: I4f6d775df4db13a4537049292edfe969d2bb45ea Reviewed-on: https://cl.tvl.fyi/c/depot/+/9590 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: flokli --- third_party/josh/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix index f2a8d7a50..9750780d1 100644 --- a/third_party/josh/default.nix +++ b/third_party/josh/default.nix @@ -3,19 +3,17 @@ let # TODO(sterni): switch to pkgs.josh as soon as that commit is released - rev = "c0a170a756dd5e63268673086218c0ce7bf18bdc"; + rev = "1586eab06284ce668779c87f00a1fb5fa9763be0"; src = pkgs.fetchFromGitHub { owner = "josh-project"; repo = "josh"; inherit rev; - hash = "sha256:0rsf65fq9xm3qj77ig3s4wmmgm50jhvwrknr839hipjj5lj4x1hp"; + hash = "sha256-94QrHcVHiEMCpBZJ5sghwtVNLNm4gdG8X85OetoGRD0="; }; - rust169 = depot.third_party.nixpkgs.rust-bin.stable."1.69.0".default; naersk = pkgs.callPackage depot.third_party.sources.naersk { - rustc = rust169; - cargo = rust169; + inherit (pkgs) rustc cargo; }; version = "git-${builtins.substring 0 8 rev}"; in