From 2a9a6cd5964547d47b356548c80cee2ebd0f33c7 Mon Sep 17 00:00:00 2001 From: dark64 Date: Tue, 15 Mar 2022 19:44:32 +0100 Subject: [PATCH] test --- Cargo.lock | 8 ++++---- Dockerfile.env | 3 ++- zokrates_core/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d46fc322..700ac584 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1138,9 +1138,9 @@ checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" [[package]] name = "git2" -version = "0.14.2" +version = "0.13.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c" +checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6" dependencies = [ "bitflags", "libc", @@ -1263,9 +1263,9 @@ checksum = "7b2f96d100e1cf1929e7719b7edb3b90ab5298072638fccd77be9ce942ecdfce" [[package]] name = "libgit2-sys" -version = "0.13.2+1.4.2" +version = "0.12.26+1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b" +checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494" dependencies = [ "cc", "libc", diff --git a/Dockerfile.env b/Dockerfile.env index 3d321422..ea2ddf53 100644 --- a/Dockerfile.env +++ b/Dockerfile.env @@ -12,7 +12,6 @@ ENV RUSTUP_HOME=/usr/local/rustup \ RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates \ curl \ - git \ build-essential \ software-properties-common \ cmake \ @@ -21,6 +20,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libgmp3-dev \ libprocps-dev \ libssl-dev \ + libgit2-dev \ + git \ pkg-config \ clang-format \ python-is-python3 \ diff --git a/zokrates_core/Cargo.toml b/zokrates_core/Cargo.toml index 65f5b60a..6e37cdcc 100644 --- a/zokrates_core/Cargo.toml +++ b/zokrates_core/Cargo.toml @@ -68,4 +68,4 @@ zokrates_fs_resolver = { version = "0.5", path = "../zokrates_fs_resolver"} [build-dependencies] cc = { version = "1.0", features = ["parallel"], optional = true } cmake = { version = "=0.1.45", optional = true } -git2 = { version = "0.14.2", optional = true, features = ["vendored-libgit2"] } +git2 = { version = "0.13", optional = true }