--- a/Cargo.toml +++ b/Cargo.toml @@ -7,25 +7,69 @@ [workspace.dependencies] better-command = { path = "./crates/better-command" } +fleet-base = { path = "./crates/fleet-base" } fleet-shared = { path = "./crates/fleet-shared" } nix-eval = { path = "./crates/nix-eval" } nixlike = { path = "./crates/nixlike" } +abort-on-drop = "0.2" age = { version = "0.11", features = ["plugin", "ssh"] } +age-core = "0.11" anyhow = "1.0" +async-trait = "0.1.88" +axum = { version = "0.8.7", features = ["http2", "macros", "ws"] } +axum-extra = { version = "0.12.2", features = ["typed-header"] } +base64 = "0.22.1" +bindgen = "0.72.0" +chrono = { version = "0.4.41", features = ["serde"] } clap = { version = "4.5", features = ["derive", "env", "unicode", "wrap_help"] } clap_complete = "4.5" +cxx = "1.0.168" +cxx-build = "1.0.168" +ed25519-dalek = "2.1" +futures = "0.3.31" +futures-util = { version = "0.3.31", features = ["sink"] } +hex = "0.4.3" +hostname = "0.4.1" +human-repr = "1.1" +hyper = "1.8.1" +indicatif = "0.18" +indoc = "2.0.6" +itertools = "0.14.0" +linked-hash-map = "0.5.6" nix = { version = "0.30.1", features = ["fs", "user"] } +nom = "8.0.0" +opentelemetry = "0.30.0" +opentelemetry-otlp = { version = "0.30.0", features = ["grpc-tonic", "gzip-tonic", "http-json"] } +opentelemetry_sdk = "0.30.0" +openssh = "0.11.5" +peg = "0.8.5" +pkg-config = "0.3.30" +rand = "0.9.1" +regex = "1.11" serde = { version = "1.0", features = ["derive"] } +serde-transcode = "1.1.1" serde_json = "1.0" +shlex = "1.3" +tabled = "0.20.0" tempfile = "3.20" +test-log = { version = "0.2.18", features = ["trace"] } +tf-provider = "0.2.2" thiserror = "2.0.12" +time = "0.3.41" tokio = { version = "1.45.1", features = ["fs", "macros", "rt", "rt-multi-thread", "sync", "time"] } +tokio-util = "0.7.17" +toml_edit = "0.23.7" tracing = "0.1" +tracing-indicatif = "0.3.13" +tracing-opentelemetry = "0.31.0" # 0.3.20 breaks ansi coloring of log output, which looks very bad with nix. # Freezing version until better solution (possibly other console log pretty-printer) is implemented. # https://github.com/tokio-rs/tracing/issues/3369 tracing-subscriber = { version = "=0.3.19", features = ["env-filter", "fmt"] } +unicode_categories = "0.1.1" +vte = { version = "0.15.0", features = ["ansi"] } +x25519-dalek = { version = "2.0.1", features = ["getrandom"] } [profile.dev] panic = "abort" --- a/cmds/fleet/Cargo.toml +++ b/cmds/fleet/Cargo.toml @@ -13,6 +13,7 @@ better-command.workspace = true clap.workspace = true clap_complete.workspace = true +fleet-base.workspace = true fleet-shared.workspace = true nix-eval.workspace = true nixlike.workspace = true @@ -23,31 +24,30 @@ tracing.workspace = true tracing-subscriber.workspace = true -abort-on-drop = "0.2" -age-core = "0.11" -async-trait = "0.1" -base64 = "0.22.1" -chrono = { version = "0.4", features = ["serde"] } -futures = "0.3" -hostname = "0.4.1" -itertools = "0.14" -openssh = "0.11" -peg = "0.8" -regex = "1.11" -shlex = "1.3" -tabled = { version = "0.20" } -time = { version = "0.3", features = ["serde"] } -tokio-util = { version = "0.7", features = ["codec"] } +abort-on-drop.workspace = true +age-core.workspace = true +async-trait.workspace = true +base64.workspace = true +chrono.workspace = true +futures.workspace = true +hostname.workspace = true +itertools.workspace = true +openssh.workspace = true +peg.workspace = true +regex.workspace = true +shlex.workspace = true +tabled.workspace = true +time = { workspace = true, features = ["serde"] } +tokio-util = { workspace = true, features = ["codec"] } -fleet-base = { version = "0.1.0", path = "../../crates/fleet-base" } -human-repr = { version = "1.1", optional = true } -indicatif = { version = "0.18", optional = true } -nom = "8.0.0" -opentelemetry = "0.30.0" -opentelemetry_sdk = "0.30.0" +human-repr = { workspace = true, optional = true } +indicatif = { workspace = true, optional = true } +nom.workspace = true +opentelemetry.workspace = true +opentelemetry_sdk.workspace = true thiserror.workspace = true -tracing-indicatif = { version = "0.3", optional = true } -tracing-opentelemetry = "0.31.0" +tracing-indicatif = { workspace = true, optional = true } +tracing-opentelemetry.workspace = true [features] default = [] --- a/cmds/generator-helper/Cargo.toml +++ b/cmds/generator-helper/Cargo.toml @@ -10,8 +10,8 @@ clap.workspace = true fleet-shared.workspace = true -base64 = "0.22.1" -ed25519-dalek = { version = "2.1" } -hex = "0.4.3" -rand = "0.9.1" -x25519-dalek = { version = "2.0.1", features = ["getrandom"] } +base64.workspace = true +ed25519-dalek.workspace = true +hex.workspace = true +rand.workspace = true +x25519-dalek.workspace = true --- a/cmds/install-secrets/Cargo.toml +++ b/cmds/install-secrets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fleet-install-secrets" -version = "0.1.0" +version.workspace = true edition.workspace = true rust-version.workspace = true --- a/cmds/pusher/Cargo.toml +++ b/cmds/pusher/Cargo.toml @@ -6,10 +6,10 @@ [dependencies] anyhow.workspace = true -axum = { version = "0.8.7", features = ["http2", "macros", "ws"] } -axum-extra = { version = "0.12.2", features = ["typed-header"] } -futures-util = { version = "0.3.31", features = ["sink"] } -hyper = "1.8.1" +axum.workspace = true +axum-extra.workspace = true +futures-util.workspace = true +hyper.workspace = true tokio = { workspace = true, features = ["macros", "process", "rt"] } -tokio-util = { version = "0.7.17", features = ["io"] } +tokio-util = { workspace = true, features = ["io"] } tracing.workspace = true --- a/cmds/repl-plugin-unstable/Cargo.toml +++ b/cmds/repl-plugin-unstable/Cargo.toml @@ -8,4 +8,4 @@ crate-type = ["cdylib"] [dependencies] -fleet-base = { version = "0.1.0", path = "../../crates/fleet-base" } +fleet-base.workspace = true --- a/cmds/terraform-provider-fleet/Cargo.toml +++ b/cmds/terraform-provider-fleet/Cargo.toml @@ -9,5 +9,5 @@ serde = { workspace = true, features = ["derive"] } tokio.workspace = true -async-trait = "0.1.88" -tf-provider = "0.2.2" +async-trait.workspace = true +tf-provider.workspace = true --- a/crates/better-command/Cargo.toml +++ b/crates/better-command/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "better-command" -version = "0.1.0" +version.workspace = true edition.workspace = true rust-version.workspace = true [dependencies] -regex = "1.11" -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -tracing = "0.1" +regex.workspace = true +serde.workspace = true +serde_json.workspace = true +tracing.workspace = true -tracing-indicatif = { version = "0.3", optional = true } +tracing-indicatif = { workspace = true, optional = true } [features] indicatif = ["tracing-indicatif"] --- a/crates/fleet-base/Cargo.toml +++ b/crates/fleet-base/Cargo.toml @@ -8,25 +8,25 @@ age.workspace = true anyhow.workspace = true better-command.workspace = true -chrono = { version = "0.4.41", features = ["serde"] } +chrono.workspace = true clap = { workspace = true, features = ["derive"] } fleet-shared.workspace = true -futures = "0.3.31" -hostname = "0.4.1" -indoc = "2.0.6" -itertools = "0.14.0" +futures.workspace = true +hostname.workspace = true +indoc.workspace = true +itertools.workspace = true nix-eval.workspace = true nixlike.workspace = true -nom = "8.0.0" -openssh = "0.11.5" -rand = "0.9.1" +nom.workspace = true +openssh.workspace = true +rand.workspace = true serde.workspace = true -serde_json = "1.0.140" -tabled = "0.20.0" +serde_json.workspace = true +tabled.workspace = true tempfile.workspace = true thiserror.workspace = true -time = { version = "0.3.41", features = ["parsing"] } +time = { workspace = true, features = ["parsing"] } tokio.workspace = true -tokio-util = { version = "0.7.15", features = ["codec"] } -toml_edit = "0.23.7" +tokio-util = { workspace = true, features = ["codec"] } +toml_edit.workspace = true tracing.workspace = true --- a/crates/fleet-shared/Cargo.toml +++ b/crates/fleet-shared/Cargo.toml @@ -5,6 +5,6 @@ rust-version.workspace = true [dependencies] -base64 = "0.22.1" -serde = "1.0.219" -unicode_categories = "0.1.1" +base64.workspace = true +serde.workspace = true +unicode_categories.workspace = true --- a/crates/nix-eval/Cargo.toml +++ b/crates/nix-eval/Cargo.toml @@ -13,17 +13,17 @@ thiserror.workspace = true tracing.workspace = true -cxx = "1.0.168" -itertools = "0.14.0" -test-log = { version = "0.2.18", features = ["trace"] } +cxx.workspace = true +itertools.workspace = true +test-log.workspace = true tokio.workspace = true -tracing-indicatif = { version = "0.3.13", optional = true } -vte = { version = "0.15.0", features = ["ansi"] } +tracing-indicatif = { workspace = true, optional = true } +vte.workspace = true [build-dependencies] -bindgen = "0.72.0" -cxx-build = "1.0.168" -pkg-config = "0.3.30" +bindgen.workspace = true +cxx-build.workspace = true +pkg-config.workspace = true [features] indicatif = ["dep:tracing-indicatif"] --- a/crates/nixlike/Cargo.toml +++ b/crates/nixlike/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "nixlike" -version = "0.1.0" +version.workspace = true edition.workspace = true rust-version.workspace = true [dependencies] thiserror.workspace = true -itertools = "0.14.0" -linked-hash-map = "0.5.6" -peg = "0.8.5" -serde = { version = "1.0.219", features = ["derive"] } -serde-transcode = "1.1.1" -serde_json = "1.0.140" +itertools.workspace = true +linked-hash-map.workspace = true +peg.workspace = true +serde.workspace = true +serde-transcode.workspace = true +serde_json.workspace = true --- a/crates/opentelemetry-exporter-env/Cargo.toml +++ b/crates/opentelemetry-exporter-env/Cargo.toml @@ -6,7 +6,7 @@ [dependencies] clap = { workspace = true, optional = true } -opentelemetry-otlp = { version = "0.30.0", features = ["grpc-tonic", "gzip-tonic", "http-json"], optional = true } +opentelemetry-otlp = { workspace = true, optional = true } thiserror.workspace = true [features]