From e0708cba8d8b95f961534bdd2d605cdda78dbb6c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 1 Jun 2021 23:34:32 +0200 Subject: fix(3p/josh): Temporarily patch instances of master->canon ... until hardcoded references are removed upstream. This is motivated by HEAD-branch related issues when cloning depot via josh and a naive search for places where `master` was used directly. Change-Id: I46709631d6ee5561344fc5f407324bcf69c641e2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3171 Tested-by: BuildkiteCI Reviewed-by: cschilling Reviewed-by: sterni --- third_party/josh/default.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'third_party/josh/default.nix') diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix index 2b6cff582c..6c49809b51 100644 --- a/third_party/josh/default.nix +++ b/third_party/josh/default.nix @@ -22,4 +22,8 @@ in depot.third_party.naersk.buildPackage { "-p" "josh-proxy" "-p" "josh-ui" ]; + + overrideMain = x: { + patches = [ ./0001-replace-mentions-of-master-with-canon.patch ]; + }; } -- cgit 1.4.1