--- a/Cargo.toml +++ b/Cargo.toml @@ -6,28 +6,21 @@ package.rust-version = "1.82.0" [workspace.dependencies] -nixlike = { path = "./crates/nixlike" } better-command = { path = "./crates/better-command" } fleet-shared = { path = "./crates/fleet-shared" } nix-eval = { path = "./crates/nix-eval" } +nixlike = { path = "./crates/nixlike" } -tokio = { version = "1.36.0", features = [ - "fs", - "rt", - "macros", - "sync", - "time", - "rt-multi-thread", -] } -tokio-util = { version = "0.7.11", features = ["codec"] } -clap = { version = "4.5", features = ["derive", "env", "wrap_help", "unicode"] } -clap_complete = "4.5" age = { version = "0.11", features = ["ssh"] } anyhow = "1.0" -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["fmt", "env-filter"] } +clap = { version = "4.5", features = ["derive", "env", "unicode", "wrap_help"] } +clap_complete = "4.5" +nix = { version = "0.29.0", features = ["fs", "user"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tempfile = "3.10" -nix = { version = "0.29.0", features = ["user", "fs"] } thiserror = "2.0.3" +tokio = { version = "1.36.0", features = ["fs", "macros", "rt", "rt-multi-thread", "sync", "time"] } +tokio-util = { version = "0.7.11", features = ["codec"] } +tracing = "0.1" +tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] } --- a/crates/nix-eval/Cargo.toml +++ b/crates/nix-eval/Cargo.toml @@ -8,17 +8,18 @@ [dependencies] anyhow.workspace = true better-command.workspace = true -futures = "0.3.30" -itertools = "0.13.0" nixlike.workspace = true -r2d2 = "0.8.10" -regex = "1.10.6" serde = { workspace = true, features = ["derive"] } serde_json.workspace = true thiserror.workspace = true -tokio = { workspace = true, features = ["process", "io-util"] } +tokio = { workspace = true, features = ["io-util", "process"] } tokio-util.workspace = true tracing.workspace = true + +futures = "0.3.30" +itertools = "0.13.0" +r2d2 = "0.8.10" +regex = "1.10.6" unindent = "0.2.3" # [build-dependencies] --- a/crates/nix-native-eval/Cargo.toml +++ b/crates/nix-native-eval/Cargo.toml @@ -6,4 +6,5 @@ [dependencies] anyhow.workspace = true + nixrs = { git = "https://github.com/Anillc/nixrs", version = "0.1.0" } --- a/crates/nixlike/Cargo.toml +++ b/crates/nixlike/Cargo.toml @@ -6,10 +6,11 @@ [dependencies] thiserror.workspace = true + alejandra = { git = "https://github.com/kamadorueda/alejandra" } linked-hash-map = "0.5.6" peg = "0.8.2" -serde = "1.0.196" -serde_json = "1.0.113" ron = "0.8.1" +serde = "1.0.196" serde-transcode = "1.1.1" +serde_json = "1.0.113" --- a/crates/nixlike/fuzz/Cargo.toml +++ b/crates/nixlike/fuzz/Cargo.toml @@ -11,9 +11,7 @@ [dependencies] libfuzzer-sys = "0.4" - -[dependencies.nixlike] -path = ".." +nixlike.path = ".." # Prevent this from interfering with workspaces [workspace] --- /dev/null +++ b/taplo.toml @@ -0,0 +1,13 @@ +[formatting] +inline_table_expand = false +indent_string = "\t" +array_auto_expand = false + +[[rule]] +include = ["**/Cargo.toml"] +keys = ['dependencies', 'workspace.dependencies'] + +[rule.formatting] +reorder_keys = true +reorder_arrays = true +column_width = 9999