diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 1ea5feb8b1c2..5de0c763d70d 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -1124,7 +1124,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "assert_cmd", @@ -1148,6 +1148,7 @@ dependencies = [ "ignore", "indicatif", "indoc", + "openssl", "portpicker", "reqwest", "reqwest-middleware", @@ -2080,6 +2081,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -3698,12 +3714,47 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +[[package]] +name = "openssl" +version = "0.10.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.18", +] + [[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.26.0+1.1.1u" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.88" @@ -3712,6 +3763,7 @@ checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -5113,7 +5165,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "clap", @@ -5130,7 +5182,7 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -5159,7 +5211,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.19.0" +version = "0.20.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5171,7 +5223,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -5220,7 +5272,7 @@ dependencies = [ [[package]] name = "shuttle-deployer" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -5270,7 +5322,7 @@ dependencies = [ [[package]] name = "shuttle-gateway" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -5298,17 +5350,20 @@ dependencies = [ "portpicker", "rand", "rcgen", + "reqwest", "ring", "rustls 0.20.8", "rustls-pemfile", "serde", "serde_json", "shuttle-common", + "shuttle-proto", "snailquote", "sqlx", "strum", "tempfile", "tokio", + "tonic", "tower", "tower-http 0.4.0", "tower-sanitize-path", @@ -5324,7 +5379,7 @@ dependencies = [ [[package]] name = "shuttle-proto" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "chrono", @@ -5341,7 +5396,7 @@ dependencies = [ [[package]] name = "shuttle-provisioner" -version = "0.19.0" +version = "0.20.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5367,7 +5422,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -5381,6 +5436,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", + "shuttle-codegen", "shuttle-common", "shuttle-proto", "shuttle-service", @@ -5399,7 +5455,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.19.0" +version = "0.20.0" dependencies = [ "anyhow", "async-trait", @@ -5407,7 +5463,6 @@ dependencies = [ "crossbeam-channel", "os_pipe", "serde", - "shuttle-codegen", "shuttle-common", "strfmt", "thiserror", diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index f4d95ee43cd9..53cbffba84f3 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-FtJaJZ76QvFXDVrQmnGO3ZCryc4aKIfs07Gbun1LfzM="; + hash = "sha256-JLrUI0Srh7bY9MBAXdju2KjFHc++9ZvQaHTJX69PRE8="; }; cargoLock = {