Skip to content

Commit 5ee3451

Browse files
garbasgarbas
authored
Update naersk input to follow upstream master (#215)
* Update naersk input to follow upstream master * vit-servicing-station: add_build_db_to_path -> master
1 parent 39b711f commit 5ee3451

File tree

7 files changed

+19
-51
lines changed

7 files changed

+19
-51
lines changed

‎Cargo.lock

Lines changed: 6 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.lock

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
inputs.rust-overlay.url = "github:oxalica/rust-overlay";
2323
inputs.rust-overlay.inputs.flake-utils.follows = "flake-utils";
2424
inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
25-
# XXX: https://github.com/nix-community/naersk/pull/167
26-
#inputs.naersk.url = "github:nix-community/naersk";
27-
inputs.naersk.url = "github:yusdacra/naersk/feat/cargolock-git-deps";
25+
inputs.naersk.url = "github:nix-community/naersk";
2826
inputs.naersk.inputs.nixpkgs.follows = "nixpkgs";
2927
inputs.voting-tools_.url = "github:input-output-hk/voting-tools?rev=6da7c45cbd1c756285ca2a1db99f82dd1a8cc16b";
3028
inputs.vit-kedqr.url = "github:input-output-hk/vit-kedqr";

‎integration-tests/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jormungandr-automation = { git ="https://github.com/input-output-hk/jormungandr.
1212
thor = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" }
1313
hersir = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" }
1414
jcli = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "master" }
15-
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "add_build_db_to_path" }
16-
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "add_build_db_to_path" }
15+
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
16+
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
1717
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch="master" }
1818
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
1919
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }

‎valgrind/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ serde_json = "1.0"
2222
warp-reverse-proxy = "0.3.2"
2323
structopt = "0.3"
2424
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
25-
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "add_build_db_to_path" }
26-
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "add_build_db_to_path" }
25+
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
26+
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
2727
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
2828
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
2929
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }

‎vitup/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr
2525
thor = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" }
2626
hersir = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "master" }
2727
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
28-
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "add_build_db_to_path" }
29-
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "add_build_db_to_path" }
28+
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
29+
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
3030
catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "main"}
3131
valgrind = { path = "../valgrind" }
3232
poldercast = { git = "https://github.com/primetype/poldercast.git", rev = "8305f1560392a9d26673ca996e7646c8834533ef" }

‎vitup/docker/local/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN cd ${ENV_PREFIX} && \
4949
RUN cd ${ENV_PREFIX} && \
5050
git clone https://github.com/input-output-hk/vit-servicing-station && \
5151
cd vit-servicing-station && \
52-
git checkout add_build_db_to_path
52+
git checkout master
5353

5454
RUN cd ${ENV_PREFIX} && \
5555
git clone https://github.com/input-output-hk/vit-testing && \

0 commit comments

Comments
 (0)