Skip to content

Commit 427ba29

Browse files
p5p5
committed
chore(deps): rollback unneeded Cargo.toml changes
Signed-off-by: Robert Sturla <[email protected]>
1 parent 72992b2 commit 427ba29

File tree

12 files changed

+51
-51
lines changed

12 files changed

+51
-51
lines changed

‎Cargo.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,34 +32,34 @@ lto = "yes"
3232

3333
[workspace.dependencies]
3434
anstream = "0.6"
35-
anyhow = "1.0.98"
36-
camino = "1.1.11"
35+
anyhow = "1.0.82"
36+
camino = "1.1.6"
3737
canon-json = "0.2.1"
38-
cap-std-ext = "4.0.6"
38+
cap-std-ext = "4.0.3"
3939
composefs = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs", features = ["rhel9"] }
4040
composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-boot" }
4141
composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "28d4721f77f973f0e394d60d6a69d9b39cb38d7f", package = "composefs-oci" }
42-
chrono = { version = "0.4.41", default-features = false }
43-
clap = "4.5.43"
44-
clap_mangen = { version = "0.2.29" }
42+
chrono = { version = "0.4.38", default-features = false }
43+
clap = "4.5.4"
44+
clap_mangen = { version = "0.2.20" }
4545
hex = "0.4.3"
46-
indoc = "2.0.6"
46+
indoc = "2.0.5"
4747
indicatif = "0.18.0"
4848
fn-error-context = "0.2.1"
49-
libc = "0.2.174"
50-
openssl = "0.10.73"
49+
libc = "0.2.154"
50+
openssl = "0.10.72"
5151
owo-colors = { version = "4" }
5252
# For the same rationale as https://github.com/coreos/rpm-ostree/commit/27f3f4b77a15f6026f7e1da260408d42ccb657b3
5353
rustix = { "version" = "1", features = ["use-libc", "thread", "net", "fs", "system", "process", "mount"] }
54-
serde = "1.0.219"
55-
serde_json = "1.0.142"
56-
similar-asserts = "1.7.0"
54+
serde = "1.0.199"
55+
serde_json = "1.0.116"
56+
similar-asserts = "1.5.0"
5757
static_assertions = "1.1.0"
58-
tempfile = "3.20.0"
59-
tracing = "0.1.41"
60-
thiserror = "2.0.12"
58+
tempfile = "3.10.1"
59+
tracing = "0.1.40"
60+
thiserror = "2.0.11"
6161
tokio = ">= 1.37.0"
62-
tokio-util = { features = ["io-util"], version = "0.7.16" }
62+
tokio-util = { features = ["io-util"], version = "0.7.10" }
6363

6464
# See https://github.com/coreos/cargo-vendor-filterer
6565
[workspace.metadata.vendor-filter]

‎crates/blockdev/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "
1212
camino = { workspace = true, features = ["serde1"] }
1313
fn-error-context = { workspace = true }
1414
libc = { workspace = true }
15-
regex = "1.11.1"
15+
regex = "1.10.4"
1616
rustix = { workspace = true }
1717
serde = { workspace = true, features = ["derive"] }
1818
serde_json = { workspace = true }
@@ -21,7 +21,7 @@ tokio = { workspace = true, features = ["signal"] }
2121
tracing = { workspace = true }
2222

2323
[dev-dependencies]
24-
indoc = "2.0.6"
24+
indoc = "2.0.5"
2525

2626
[lib]
2727
path = "src/blockdev.rs"

‎crates/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ anyhow = { workspace = true }
1919
bootc-lib = { version = "1.6", path = "../lib" }
2020
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
2121
tokio = { workspace = true, features = ["macros"] }
22-
log = "0.4.27"
22+
log = "0.4.21"
2323
owo-colors = { workspace = true }
2424
tracing = { workspace = true }
2525

‎crates/lib/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ rust-version = "1.82.0"
1414
include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
1515

1616
[dependencies]
17-
anstream = "0.6.20"
18-
anstyle = "1.0.11"
17+
anstream = "0.6.13"
18+
anstyle = "1.0.6"
1919
anyhow = { workspace = true }
2020
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "0.0.0" }
2121
bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "0.0.0" }
@@ -28,7 +28,7 @@ composefs-boot = { workspace = true }
2828
composefs-oci = { workspace = true }
2929
ostree-ext = { path = "../ostree-ext", features = ["bootc"] }
3030
chrono = { workspace = true, features = ["serde"] }
31-
clap = { workspace = true, features = ["derive", "cargo"] }
31+
clap = { workspace = true, features = ["derive","cargo"] }
3232
clap_mangen = { workspace = true, optional = true }
3333
#composefs = "0.2.0"
3434
cap-std-ext = { workspace = true, features = ["fs_utf8"] }
@@ -41,22 +41,22 @@ liboverdrop = "0.1.0"
4141
libsystemd = "0.7"
4242
linkme = "0.3"
4343
openssl = { workspace = true }
44-
regex = "1.11.1"
44+
regex = "1.10.4"
4545
rustix = { workspace = true }
4646
schemars = { version = "1.0.4", features = ["chrono04"] }
4747
serde = { workspace = true, features = ["derive"] }
48-
serde_ignored = "0.1.12"
48+
serde_ignored = "0.1.10"
4949
serde_json = { workspace = true }
5050
serde_yaml = "0.9.34"
5151
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
5252
tokio-util = { workspace = true }
5353
tracing = { workspace = true }
5454
tempfile = { workspace = true }
5555
toml = "0.9.5"
56-
xshell = { version = "0.2.7", optional = true }
57-
uuid = { version = "1.17.0", features = ["v4"] }
56+
xshell = { version = "0.2.6", optional = true }
57+
uuid = { version = "1.8.0", features = ["v4"] }
5858
tini = "1.3.0"
59-
comfy-table = "7.1.4"
59+
comfy-table = "7.1.1"
6060
thiserror = { workspace = true }
6161
canon-json = { workspace = true }
6262
nom = "8.0.0"

‎crates/lib/src/parsers/grub_menuconfig.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ mod test {
293293
search: Some("--no-floppy --set=root --fs-uuid \"${EFI_PART_UUID}\""),
294294
chainloader: Some("/EFI/Linux/uki.efi"),
295295
extra: vec![
296-
("extra_field1", "this is extra"),
296+
("extra_field1", "this is extra"),
297297
("extra_field2", "this is also extra")
298298
]
299299
},
@@ -483,21 +483,21 @@ mod test {
483483
let content = r#"
484484
# Some initial config
485485
set timeout=10
486-
486+
487487
menuentry "First Entry" {
488488
insmod fat
489489
chainloader /EFI/Linux/first.efi
490490
}
491-
491+
492492
# Some comments between entries
493493
set default=0
494-
494+
495495
menuentry "Second Entry" {
496496
insmod ext2
497497
search --set=root --fs-uuid "some-uuid"
498498
chainloader /EFI/Linux/second.efi
499499
}
500-
500+
501501
# Trailing content
502502
"#;
503503

‎crates/mount/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ serde = { workspace = true, features = ["derive"] }
1919
tracing = { workspace = true }
2020

2121
[dev-dependencies]
22-
indoc = "2.0.6"
22+
indoc = "2.0.5"
2323

2424
[lib]
2525
path = "src/mount.rs"

‎crates/ostree-ext/Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@ clap = { workspace = true, features = ["derive","cargo"] }
2424
clap_mangen = { workspace = true, optional = true }
2525
comfy-table = "7.1.4"
2626
cap-std-ext = { workspace = true, features = ["fs_utf8"] }
27-
flate2 = { features = ["zlib"], default-features = false, version = "1.1.2" }
27+
flate2 = { features = ["zlib"], default-features = false, version = "1.0.20" }
2828
fn-error-context = { workspace = true }
29-
futures-util = "0.3.31"
30-
gvariant = "0.5.1"
29+
futures-util = "0.3.13"
30+
gvariant = "0.5.0"
3131
hex = { workspace = true }
3232
io-lifetimes = "3"
3333
indicatif = { workspace = true }
3434
libc = { workspace = true }
35-
libsystemd = "0.7.2"
35+
libsystemd = "0.7.0"
3636
openssl = { workspace = true }
3737
ocidir = "0.4.0"
38-
pin-project = "1.1"
39-
regex = "1.11.1"
38+
pin-project = "1.0"
39+
regex = "1.5.4"
4040
rustix = { workspace = true, features = ["fs", "process"] }
4141
serde = { workspace = true, features = ["derive"] }
4242
serde_json = { workspace = true }
43-
tar = "0.4.44"
43+
tar = "0.4.43"
4444
tempfile = { workspace = true }
4545
tokio = { workspace = true, features = ["io-std", "time", "process", "rt", "net"] }
4646
tokio-util = { workspace = true }
4747
tokio-stream = { features = ["sync"], version = "0.1.17" }
4848
tracing = "0.1"
49-
zstd = { version = "0.13.3", features = ["pkg-config"] }
50-
indexmap = { version = "2.10.0", features = ["serde"] }
49+
zstd = { version = "0.13.1", features = ["pkg-config"] }
50+
indexmap = { version = "2.2.2", features = ["serde"] }
5151

5252
indoc = { version = "2", optional = true }
5353
xshell = { version = "0.2", optional = true }
54-
similar-asserts = { version = "1.7.0", optional = true }
54+
similar-asserts = { version = "1.5.0", optional = true }
5555
canon-json = { workspace = true }
5656

5757
[dev-dependencies]

‎crates/ostree-ext/src/fixture.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ fn relative_path_components(p: &Utf8Path) -> impl Iterator<Item = Utf8Component<
346346
}
347347

348348
/// Walk over the whole filesystem, and generate mappings from content object checksums
349-
/// to the package that owns them.
349+
/// to the package that owns them.
350350
///
351351
/// In the future, we could compute this much more efficiently by walking that
352352
/// instead. But this design is currently oriented towards accepting a single ostree

‎crates/system-reinstall-bootc/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ clap = { workspace = true, features = ["derive"] }
2121
crossterm = "0.29.0"
2222
dialoguer = "0.11.0"
2323
indoc = { workspace = true }
24-
log = "0.4.27"
24+
log = "0.4.21"
2525
openssh-keys = "0.6.4"
2626
rustix = { workspace = true }
2727
serde = { workspace = true, features = ["derive"] }
2828
serde_json = { workspace = true }
29-
serde_yaml = "0.9.34"
29+
serde_yaml = "0.9.22"
3030
tempfile = { workspace = true }
3131
tracing = { workspace = true }
3232
uzers = "0.12.1"

‎crates/tests-integration/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ cap-std-ext = { workspace = true }
1717
clap = { workspace = true, features = ["derive","cargo"] }
1818
fn-error-context = { workspace = true }
1919
indoc = { workspace = true }
20-
libtest-mimic = "0.8.1"
21-
oci-spec = "0.8.1"
20+
libtest-mimic = "0.8.0"
21+
oci-spec = "0.8.0"
2222
rexpect = "0.6"
2323
rustix = { workspace = true }
2424
serde = { workspace = true, features = ["derive"] }
2525
serde_json = { workspace = true }
2626
tempfile = { workspace = true }
27-
xshell = { version = "0.2.7" }
27+
xshell = { version = "0.2.6" }
2828

2929
[lints]
3030
workspace = true

0 commit comments

Comments
 (0)