Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Making sure we're not fetching dependencies from the heads of other repos #515

Merged
merged 2 commits into from
Mar 22, 2024
Merged

Making sure we're not fetching dependencies from the heads of other repos #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f65cb
Stop our build dependencies coming out of my repo
DavidM-D Mar 22, 2024
8eefe21
Don't fetch from the head of other repos
DavidM-D Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
use flake 'github:DavidM-D/workspaces?dir=rust'
use flake .
62 changes: 55 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 29 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,59 @@
pkgs = import nixpkgs { inherit system overlays; };

# Pick what rust compiler to use
rustVersion = pkgs.rust-bin.stable.latest.default;
in {
devShell = pkgs.mkShell {

# More agressively cache build artefacts
# Uses more disk but speeds up compile times significantly
env = {
SCCACHE_GHA_ENABLED = true;
RUSTC_WRAPPER = "sccache";
};

# Everything in this list is added to your path
buildInputs =
with pkgs;
buildInputs = with pkgs;
[
# Native build dependencies
protobuf
curl
gmp
openssl

# Development
# A nice LSP IDE backend
rust-analyzer

# A very opinionated linter
clippy

# Adds cargo, rustc and rustfmt
(rustVersion.override {

# We need this for rust analyzer to jump to library code
extensions = [ "rust-src" ];

# Add foreign compile targets here
targets = [
"wasm32-unknown-unknown"
"x86_64-apple-darwin"
"wasm32-wasi"
];
})
cargo-watch
cargo-audit
sccache

# TODO Add podman + docker image dependencies
# TODO Add AWS-CLI and dummy credentials
] ++

pkgs.lib.optionals pkgs.stdenv.isDarwin
[
pkgs.lib.optionals pkgs.stdenv.isDarwin [
# Mac crypto libs
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.SystemConfiguration
];
];
};
});
}
2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ aws-types = "0.54.0"
bollard = "0.13"
cait-sith = { git = "https://github.com/LIT-Protocol/cait-sith.git", features = [
"k256",
] }
], rev = "da627425fa62994838ee3469d77e61725432766a"}
clap = { version = "4.2", features = ["derive", "env"] }
curv = { package = "curv-kzen", version = "0.9", default-features = false }
ed25519-dalek = { version = "1.0.1", features = ["serde"] }
Expand Down
6 changes: 3 additions & 3 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ axum = { version = "0.6.19" }
axum-extra = "0.7"
cait-sith = { git = "https://github.com/LIT-Protocol/cait-sith.git", features = [
"k256",
] }
], rev = "da627425fa62994838ee3469d77e61725432766a"}
clap = { version = "4.2", features = ["derive", "env"] }
google-datastore1 = "5"
google-secretmanager1 = "5"
Expand All @@ -42,8 +42,8 @@ url = { version = "2.4.0", features = ["serde"] }

near-crypto = "0.17"
near-fetch = "0.0.12"
near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs.git", branch = "daniyar/upgrade-sdk" }
near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs.git", branch = "daniyar/upgrade-sdk" }
near-lake-framework = { git = "https://github.com/near/near-lake-framework-rs.git", rev = "dc0f1f9"} # branch = "daniyar/upgrade-sdk"
near-lake-primitives = { git = "https://github.com/near/near-lake-framework-rs.git", rev = "dc0f1f9" } # branch = "daniyar/upgrade-sdk"
near-primitives = "0.17.0"
near-sdk = "5.0.0-alpha.1"

Expand Down
Loading