about summary refs log tree commit diff
path: root/third_party/josh/default.nix
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-01-18T09·02+0300
committerclbot <clbot@tvl.fyi>2022-01-18T09·56+0000
commite0d00b962125ea5d0f5858bce62536bef8b6f7b3 (patch)
tree9a63b7139114c577b64502143dfcbcc2608daa63 /third_party/josh/default.nix
parente5181a13eddf2a1712f6d5ac19256204aa0f826e (diff)
feat(3p/josh): Bump to latest master r/3626
Change-Id: I32104d1cdc6d9cd72543d66bbe2f146e8ac27f6d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4988
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/josh/default.nix')
-rw-r--r--third_party/josh/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/third_party/josh/default.nix b/third_party/josh/default.nix
index 9b529304ce..3a4e494e5f 100644
--- a/third_party/josh/default.nix
+++ b/third_party/josh/default.nix
@@ -5,8 +5,8 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "esrlabs";
     repo = "josh";
-    rev = "4a70f2914260066b2db44f4cabe9b80acdd556af";
-    sha256 = "0gwn3daj24538h5ddksvnyhq4lyjh0br9k49jhbd7r1sm6ly2cwl";
+    rev = "69dc986e506ba5631c8bbf52835da076a18ec8dc";
+    hash = "sha256:0ybc6ivjkm7bchaszs9lhbl1gbjnyhwq7a3vw6jml3ama84l52lb";
   };
 in depot.third_party.naersk.buildPackage {
   inherit src;
@@ -22,8 +22,4 @@ in depot.third_party.naersk.buildPackage {
     "-p" "josh-proxy"
     "-p" "josh-ui"
   ];
-
-  overrideMain = x: {
-    patches = [ ./0001-replace-mentions-of-master-with-canon.patch ];
-  };
 }