From 07cc666668bfb3b6a825b48178c77cfc76c3a1de Mon Sep 17 00:00:00 2001
From: Olivier Picaud <opicaud.mailbox@gmail.com>
Date: Fri, 7 Jul 2023 22:25:10 +0200
Subject: [PATCH] fix: tag onig to be able to reproduce deterministic build

---
 rust/BUILD.bazel           | 7 -------
 rust/Cargo.lock            | 4 ++--
 rust/Cargo.toml            | 2 +-
 rust/WORKSPACE             | 4 ++++
 rust/cargo-bazel-lock.json | 7 ++++---
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/rust/BUILD.bazel b/rust/BUILD.bazel
index 746123056..2f41575d3 100644
--- a/rust/BUILD.bazel
+++ b/rust/BUILD.bazel
@@ -1,12 +1,5 @@
 load("@rules_rust//cargo:defs.bzl", "cargo_bootstrap_repository")
 
-filegroup(
-    name = "pact_bin",
-    srcs = [
-        "@pact_verifier_cli"
-    ],
-)
-
 filegroup(
     name = "pact_verifier_cli",
     srcs = ["//pact_verifier_cli"],
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index fde814cd2..e0de80b85 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1443,7 +1443,7 @@ checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 [[package]]
 name = "onig"
 version = "6.4.0"
-source = "git+https://github.com/rust-onig/rust-onig?branch=main#76bc1d29651bd17c7d5ecea9266bd2e0e83cb2e0"
+source = "git+https://github.com/rust-onig/rust-onig?rev=fa90c0e97e90a056af89f183b23cd417b59ee6a2#fa90c0e97e90a056af89f183b23cd417b59ee6a2"
 dependencies = [
  "bitflags",
  "libc",
@@ -1454,7 +1454,7 @@ dependencies = [
 [[package]]
 name = "onig_sys"
 version = "69.8.1"
-source = "git+https://github.com/rust-onig/rust-onig?branch=main#76bc1d29651bd17c7d5ecea9266bd2e0e83cb2e0"
+source = "git+https://github.com/rust-onig/rust-onig?rev=fa90c0e97e90a056af89f183b23cd417b59ee6a2#fa90c0e97e90a056af89f183b23cd417b59ee6a2"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 1bb346863..9c9b99009 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -15,4 +15,4 @@ exclude = [
 ]
 
 [patch.crates-io]
-onig = { git = "https://github.com/rust-onig/rust-onig", default-features = false, branch = "main" }
+onig = { git = "https://github.com/rust-onig/rust-onig", default-features = false, rev = "fa90c0e97e90a056af89f183b23cd417b59ee6a2" }
diff --git a/rust/WORKSPACE b/rust/WORKSPACE
index 8c3dd0c1b..ef8a9c184 100644
--- a/rust/WORKSPACE
+++ b/rust/WORKSPACE
@@ -40,6 +40,10 @@ crates_repository(
        "os_info": crate.spec(
         version = "3.5.1",
     )},
+    annotations = {
+       "onig": [crate.annotation(
+        shallow_since = "1686508130 +0100",
+    )]}
 )
 
 load("@crate_index//:defs.bzl", "crate_repositories")
diff --git a/rust/cargo-bazel-lock.json b/rust/cargo-bazel-lock.json
index bc85c4be3..d2b07564a 100644
--- a/rust/cargo-bazel-lock.json
+++ b/rust/cargo-bazel-lock.json
@@ -1,5 +1,5 @@
 {
-  "checksum": "ee8e8782851d487e5e4e0f74dde52e00c852db12df0405404008c71e31cfe3c6",
+  "checksum": "92d28299bbd5288e1d7398ffff4d5da5a083f6f867219cae6bf5448df9961797",
   "crates": {
     "addr2line 0.19.0": {
       "name": "addr2line",
@@ -7642,8 +7642,9 @@
         "Git": {
           "remote": "https://github.com/rust-onig/rust-onig",
           "commitish": {
-            "Branch": "main"
+            "Rev": "fa90c0e97e90a056af89f183b23cd417b59ee6a2"
           },
+          "shallow_since": "1686508130 +0100",
           "strip_prefix": "onig"
         }
       },
@@ -7699,7 +7700,7 @@
         "Git": {
           "remote": "https://github.com/rust-onig/rust-onig",
           "commitish": {
-            "Branch": "main"
+            "Rev": "fa90c0e97e90a056af89f183b23cd417b59ee6a2"
           },
           "strip_prefix": "onig_sys"
         }