diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml index 5bbb18e9..97489b7f 100644 --- a/.github/workflows/build_releases.yml +++ b/.github/workflows/build_releases.yml @@ -28,7 +28,7 @@ env: CARGO_HUSKY_DONT_INSTALL_HOOKS: true COMPLETION_DIR: "target/tmp/bottom/completion/" MANPAGE_DIR: "target/tmp/bottom/manpage/" - CROSS_VERSION: "git:d6204e62acdba1a117341f93972f3d52470a3052" + CROSS_VERSION: "git:a9301e91f72bba3850460512685f6b16062015ff" permissions: id-token: write @@ -133,7 +133,8 @@ jobs: os: "ubuntu-22.04", artifact_name: "x86_64-unknown-linux-gnu-2-17", cross: true, - cross_image: "ghcr.io/cross-rs/x86_64-unknown-linux-gnu@sha256:ab2070e67704b2c85d0d1fa50a0165ec438ed87fd1dc1a4058692a2348c071cb", # edge-centos + # https://github.com/cross-rs/cross/pkgs/container/x86_64-unknown-linux-gnu/1554248584?tag=edge-centos + cross_image: "ghcr.io/cross-rs/x86_64-unknown-linux-gnu@sha256:1be9b0f725e4fdd4f7fb90c8e29678414cda08e7ddd2489d78555e6b2fe4176b", } # Android diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87a20b4a..587bcc02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ env: CARGO_HUSKY_DONT_INSTALL_HOOKS: true COMPLETION_DIR: "target/tmp/bottom/completion/" MANPAGE_DIR: "target/tmp/bottom/manpage/" - CROSS_VERSION: "git:d6204e62acdba1a117341f93972f3d52470a3052" + CROSS_VERSION: "git:a9301e91f72bba3850460512685f6b16062015ff" concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/Cargo.lock b/Cargo.lock index 04b89ff8..69591157 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -955,9 +955,9 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "ntapi" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081" +checksum = "c3b335231dfd352ffb0f8017f3b6027a4917f7df785ea2143d8af2adc66980ae" dependencies = [ "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 359993db..151390c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ doc = false battery = ["dep:starship-battery"] musl_alloc = ["dep:mimalloc"] nvidia = ["gpu", "dep:nvml-wrapper"] -gpu = [] +gpu = ["sysinfo/gpu"] zfs = [] deploy = ["battery", "nvidia", "zfs"] default = ["deploy"] @@ -98,7 +98,7 @@ regex = "1.13.1" rustc-hash = "2.1.3" serde = { version = "1.0.228", features = ["derive"] } starship-battery = { version = "0.12.0", optional = true } -sysinfo = "=0.40.3" +sysinfo = { version = "=0.40.3", default-features = false, features = ["component", "disk", "network", "system", "user"] } timeless = "0.1.0" toml_edit = { version = "0.25.12", features = ["serde"] } unicode-ellipsis = "0.6.0" diff --git a/schema/nightly/bottom.json b/schema/nightly/bottom.json index 05dafbe0..3e63a176 100644 --- a/schema/nightly/bottom.json +++ b/schema/nightly/bottom.json @@ -301,7 +301,7 @@ "$ref": "#/$defs/SortOrder" }, "use_binary_prefix": { - "description": "Use binary prefixes (e.g. GiB, MiB) instead of decimal prefixes (e.g. GB, MB).\n\nDefaults to decimal prefixes.", + "description": "Use binary prefixes (e.g. GiB, MiB) instead of decimal prefixes (e.g.\nGB, MB).\n\nDefaults to decimal prefixes.", "type": [ "boolean", "null" diff --git a/scripts/schema_gen/Cargo.lock b/scripts/schema_gen/Cargo.lock index a2d3c605..f40a5064 100644 --- a/scripts/schema_gen/Cargo.lock +++ b/scripts/schema_gen/Cargo.lock @@ -133,6 +133,7 @@ dependencies = [ "nvml-wrapper", "ratatui", "ratatui-core", + "ratatui-crossterm", "regex", "rustc-hash", "rustix", @@ -671,9 +672,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.189" +version = "0.2.191" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" [[package]] name = "libloading" @@ -1028,7 +1029,6 @@ checksum = "3274ba0a2c5e1bcad2a2005d20f4dc59dad26b2eb0940fb094500dba4099d57d" dependencies = [ "instability", "ratatui-core", - "ratatui-crossterm", "ratatui-widgets", "serde", ] @@ -1178,9 +1178,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags", "errno", @@ -1450,9 +1450,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.39.6" +version = "0.40.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2071df9448915b71c4fe6d25deaf1c22f12bd234f01540b77312bb8e41361e6" +checksum = "a86bac2f7d06e6384984118ad727f5694110f0ec44d924d05c8fdec3d030bee6" dependencies = [ "libc", "memchr",