mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/josh): Bump version to latest HEAD

Browse source 
This lets us drop the patch for pinning the git library, as this one
is now pinned to something upstream.

Change-Id: Ib8026f5f22e2e49371a2bad83aa726c2951570e4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3086
Tested-by: BuildkiteCI
Reviewed-by: eta <eta@theta.eu.org>
This commit is contained in:
Vincent Ambo 2021-05-02 16:37:23 +02:00 committed by tazjin
parent 790c0d938e
commit 47986fdc21
2 changed files with 3 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
third_party/josh/default.nix vendored
View file

@ -2,19 +2,11 @@
{ depot, pkgs, ... }:
let
gitSrc = pkgs.fetchFromGitHub {
src = pkgs.fetchFromGitHub {
owner = "esrlabs";
repo = "josh";
rev = "1c1965deb0278de92452a597c092f16b531274ae";
sha256 = "0a0ybx4dqr9gfcn1kqy2nirdsfbdwkfz24ljnri564c5381ccldw";
};
src = pkgs.applyPatches {
name = "josh-src";
src = gitSrc;
patches = [
./pin-git2-rev.patch
];
rev = "92fd7fb193d0df25b106207675f233cfe1d26d0d";
sha256 = "0fzy9xbr0vnw239gl8famrqncn8pxlnwkfvy3gxl7c80d78yg9j7";
};
in depot.third_party.naersk.buildPackage {
inherit src;

62
third_party/josh/pin-git2-rev.patch vendored
View file

@ -1,62 +0,0 @@
From 1b743ee032fe14836f8b8d49e512f67adfe2440b Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Thu, 15 Apr 2021 17:05:10 +0200
Subject: [PATCH] Pin git2 revision in Cargo.toml
---
Cargo.lock | 4 ++--
Cargo.toml | 2 +-
josh-proxy/Cargo.toml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 5ee1b34..50139e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -636,7 +636,7 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
[[package]]
name = "git2"
version = "0.13.17"
-source = "git+https://github.com/initcrash/git2-rs.git#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
+source = "git+https://github.com/initcrash/git2-rs.git?rev=758aab9fc08fa59b57b3968a2ef6f0901a2b7007#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
dependencies = [
"bitflags",
"libc",
@@ -1153,7 +1153,7 @@ checksum = "ba4aede83fc3617411dc6993bc8c70919750c1c257c6ca6a502aed6e0e2394ae"
[[package]]
name = "libgit2-sys"
version = "0.12.18+1.1.0"
-source = "git+https://github.com/initcrash/git2-rs.git#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
+source = "git+https://github.com/initcrash/git2-rs.git?rev=758aab9fc08fa59b57b3968a2ef6f0901a2b7007#758aab9fc08fa59b57b3968a2ef6f0901a2b7007"
dependencies = [
"cc",
"libc",
diff --git a/Cargo.toml b/Cargo.toml
index 4234701..4dcbcd6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ members = ["josh-proxy", "josh-ui"]
[dependencies]
handlebars = "3.5"
#git2 = {version = "0.13", default-features = false}
-git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false}
+git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false, rev = "758aab9fc08fa59b57b3968a2ef6f0901a2b7007" }
#git2 = { path="../../git2-rs", default-features = false}
clap = "2"
tracing = "*"
diff --git a/josh-proxy/Cargo.toml b/josh-proxy/Cargo.toml
index 6d1c30d..680af88 100644
--- a/josh-proxy/Cargo.toml
+++ b/josh-proxy/Cargo.toml
@@ -20,7 +20,7 @@ hyper_cgi = "0.1"
hyper-staticfile = "*"
hyper-tls = "*"
toml = "0.5"
-git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false}
+git2 = { git = "https://github.com/initcrash/git2-rs.git", default-features = false, rev = "758aab9fc08fa59b57b3968a2ef6f0901a2b7007" }
tracing = { version = "0.1", features = ["max_level_trace", "release_max_level_trace"] }
tracing-futures = "0.2"
tracing-subscriber = "0.2"
--
2.31.1.295.g9ea45b61b8-goog