diff --git a/Cargo.lock b/Cargo.lock index 1a44fc83..c993100b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "amdgpu-sysfs" -version = "0.21.1" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb53ee2a9c2f4a63b349793a8c247500016e0a23d674226c44f1a6916582e866" dependencies = [ "enum_dispatch", "serde", diff --git a/Cargo.toml b/Cargo.toml index 65c53e9a..74046326 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,7 @@ members = [ edition = "2024" [workspace.dependencies] -#amdgpu-sysfs = { git = "https://github.com/ilya-zlobintsev/amdgpu-sysfs-rs.git", rev = "215eafbcbca0fe28f66f8ba0cbcec0f547baaba1", features = ["serde"] } -amdgpu-sysfs = { path = "../amdgpu-sysfs-rs", features = ["serde"] } +amdgpu-sysfs = { version = "0.22.0", features = ["serde"] } nvml-wrapper = { git = "https://github.com/rust-nvml/nvml-wrapper.git", rev = "eb47417eede43443f139053479618e96ad32893d" } serde = { version = "1.0", features = ["derive"] } serde_with = { version = "3.21.0", default-features = false, features = [ diff --git a/flatpak/generated-sources.json b/flatpak/generated-sources.json index b5206bf9..4fec31d7 100644 --- a/flatpak/generated-sources.json +++ b/flatpak/generated-sources.json @@ -1,10 +1,4 @@ [ - { - "type": "git", - "url": "https://github.com/ilya-zlobintsev/amdgpu-sysfs-rs", - "commit": "215eafbcbca0fe28f66f8ba0cbcec0f547baaba1", - "dest": "flatpak-cargo/git/amdgpu-sysfs-rs-215eafb" - }, { "type": "git", "url": "https://github.com/rust-nvml/nvml-wrapper", @@ -64,21 +58,16 @@ "dest-filename": ".cargo-checksum.json" }, { - "type": "shell", - "commands": [ - "cp -r --reflink=auto \"flatpak-cargo/git/amdgpu-sysfs-rs-215eafb/.\" \"cargo/vendor/amdgpu-sysfs\"" - ] + "type": "archive", + "archive-type": "tar-gzip", + "url": "https://static.crates.io/crates/amdgpu-sysfs/amdgpu-sysfs-0.22.0.crate", + "sha256": "cb53ee2a9c2f4a63b349793a8c247500016e0a23d674226c44f1a6916582e866", + "dest": "cargo/vendor/amdgpu-sysfs-0.22.0" }, { "type": "inline", - "contents": "[package]\nname = \"amdgpu-sysfs\"\nversion = \"0.21.0\"\nauthors = [ \"Ilya Zlobintsev \",]\nedition = \"2021\"\nlicense = \"LGPL-3.0-or-later\"\nrepository = \"https://github.com/ilya-zlobintsev/amdgpu-sysfs-rs/\"\ndescription = \"Library for interacting with the Linux Kernel SysFS interface for GPUs (mainly targeted at the AMDGPU driver).\"\n\n[features]\ndefault = [ \"overdrive\",]\noverdrive = [ \"enum_dispatch\",]\n\n[dev-dependencies]\npretty_assertions = \"1.4.1\"\nrust-embed = \"8.7.2\"\ntempfile = \"3.22.0\"\n\n[dependencies.enum_dispatch]\nversion = \"0.3.8\"\noptional = true\n\n[dependencies.serde]\nversion = \"1\"\nfeatures = [ \"derive\",]\noptional = true\n\n[dev-dependencies.amdgpu-sysfs]\npath = \".\"\nfeatures = [ \"serde\",]\n\n[dev-dependencies.insta]\nversion = \"1.43.2\"\nfeatures = [ \"yaml\", \"redactions\",]\n", - "dest": "cargo/vendor/amdgpu-sysfs", - "dest-filename": "Cargo.toml" - }, - { - "type": "inline", - "contents": "{\"package\": null, \"files\": {}}", - "dest": "cargo/vendor/amdgpu-sysfs", + "contents": "{\"package\": \"cb53ee2a9c2f4a63b349793a8c247500016e0a23d674226c44f1a6916582e866\", \"files\": {}}", + "dest": "cargo/vendor/amdgpu-sysfs-0.22.0", "dest-filename": ".cargo-checksum.json" }, { @@ -2663,7 +2652,7 @@ }, { "type": "inline", - "contents": "[package]\nname = \"nvml-wrapper\"\nversion = \"0.12.1\"\nauthors = [ \"Cldfire\",]\ndescription = \"A safe and ergonomic Rust wrapper for the NVIDIA Management Library\"\nreadme = \"../README.md\"\ndocumentation = \"https://docs.rs/nvml-wrapper\"\nrepository = \"https://github.com/Cldfire/nvml-wrapper\"\nlicense = \"MIT OR Apache-2.0\"\nedition = \"2021\"\nrust-version = \"1.60.0\"\nkeywords = [ \"nvidia\", \"gpu\", \"managment\", \"monitoring\", \"hardware\",]\ncategories = [ \"api-bindings\", \"hardware-support\",]\n\n[features]\ndefault = []\nlegacy-functions = [ \"nvml-wrapper-sys/legacy-functions\",]\nserde = [ \"dep:serde\", \"dep:serde_derive\", \"bitflags/serde\",]\n\n[dependencies]\nthiserror = \"1.0\"\nbitflags = \"2.4.0\"\nwrapcenum-derive = \"0.4.1\"\nlibloading = \"0.8.1\"\nstatic_assertions = \"1.1\"\n\n[dev-dependencies]\npretty-bytes = \"0.2\"\n\n[dependencies.serde]\nversion = \"1.0\"\noptional = true\n\n[dependencies.serde_derive]\nversion = \"1.0\"\noptional = true\n\n[dependencies.nvml-wrapper-sys]\nversion = \"0.9.1\"\npath = \"../nvml-wrapper-sys\"\n", + "contents": "[package]\nname = \"nvml-wrapper\"\nversion = \"0.12.1\"\nauthors = [\"Cldfire\"]\ndescription = \"A safe and ergonomic Rust wrapper for the NVIDIA Management Library\"\nreadme = \"../README.md\"\ndocumentation = \"https://docs.rs/nvml-wrapper\"\nrepository = \"https://github.com/Cldfire/nvml-wrapper\"\nlicense = \"MIT OR Apache-2.0\"\nedition = \"2021\"\nrust-version = \"1.60.0\"\nkeywords = [\"nvidia\", \"gpu\", \"managment\", \"monitoring\", \"hardware\"]\ncategories = [\"api-bindings\", \"hardware-support\"]\n\n[features]\ndefault = []\nlegacy-functions = [\"nvml-wrapper-sys/legacy-functions\"]\nserde = [\"dep:serde\", \"dep:serde_derive\", \"bitflags/serde\"]\n\n[dependencies]\nthiserror = \"1.0\"\nbitflags = \"2.4.0\"\nwrapcenum-derive = \"0.4.1\"\nlibloading = \"0.8.1\"\nstatic_assertions = \"1.1\"\n\n[dependencies.serde]\nversion = \"1.0\"\noptional = true\n\n[dependencies.serde_derive]\nversion = \"1.0\"\noptional = true\n\n[dependencies.nvml-wrapper-sys]\nversion = \"0.9.1\"\npath = \"../nvml-wrapper-sys\"\n\n[dev-dependencies]\npretty-bytes = \"0.2\"\n", "dest": "cargo/vendor/nvml-wrapper", "dest-filename": "Cargo.toml" }, @@ -2681,7 +2670,7 @@ }, { "type": "inline", - "contents": "[package]\nname = \"nvml-wrapper-sys\"\nversion = \"0.9.1\"\nauthors = [ \"Cldfire\",]\ndescription = \"Generated bindings to the NVIDIA Management Library.\"\nreadme = \"README.md\"\ndocumentation = \"https://docs.rs/nvml-wrapper-sys\"\nrepository = \"https://github.com/Cldfire/nvml-wrapper\"\nlicense = \"MIT OR Apache-2.0\"\nedition = \"2021\"\nrust-version = \"1.60.0\"\nkeywords = [ \"nvidia\", \"gpu\", \"managment\", \"monitoring\", \"hardware\",]\ncategories = [ \"external-ffi-bindings\", \"hardware-support\",]\nexclude = [ \"nvml.h\",]\n\n[dependencies]\nlibloading = \"0.8.1\"\n\n[features]\ndefault = []\nlegacy-functions = []\n", + "contents": "[package]\nname = \"nvml-wrapper-sys\"\nversion = \"0.9.1\"\nauthors = [\"Cldfire\"]\ndescription = \"Generated bindings to the NVIDIA Management Library.\"\nreadme = \"README.md\"\ndocumentation = \"https://docs.rs/nvml-wrapper-sys\"\nrepository = \"https://github.com/Cldfire/nvml-wrapper\"\nlicense = \"MIT OR Apache-2.0\"\nedition = \"2021\"\nrust-version = \"1.60.0\"\nkeywords = [\"nvidia\", \"gpu\", \"managment\", \"monitoring\", \"hardware\"]\ncategories = [\"external-ffi-bindings\", \"hardware-support\"]\nexclude = [\"nvml.h\"]\n\n[dependencies]\nlibloading = \"0.8.1\"\n\n[features]\ndefault = []\nlegacy-functions = []\n", "dest": "cargo/vendor/nvml-wrapper-sys", "dest-filename": "Cargo.toml" }, @@ -5384,7 +5373,7 @@ }, { "type": "inline", - "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/ilya-zlobintsev/amdgpu-sysfs-rs\"]\ngit = \"https://github.com/ilya-zlobintsev/amdgpu-sysfs-rs\"\nreplace-with = \"vendored-sources\"\nrev = \"215eafbcbca0fe28f66f8ba0cbcec0f547baaba1\"\n\n[source.\"https://github.com/rust-nvml/nvml-wrapper\"]\ngit = \"https://github.com/rust-nvml/nvml-wrapper\"\nreplace-with = \"vendored-sources\"\nrev = \"eb47417eede43443f139053479618e96ad32893d\"\n", + "contents": "[source.vendored-sources]\ndirectory = \"cargo/vendor\"\n\n[source.crates-io]\nreplace-with = \"vendored-sources\"\n\n[source.\"https://github.com/rust-nvml/nvml-wrapper\"]\ngit = \"https://github.com/rust-nvml/nvml-wrapper\"\nreplace-with = \"vendored-sources\"\nrev = \"eb47417eede43443f139053479618e96ad32893d\"\n", "dest": "cargo", "dest-filename": "config" } diff --git a/lact-gui/Cargo.toml b/lact-gui/Cargo.toml index f765ec19..9c6aa330 100644 --- a/lact-gui/Cargo.toml +++ b/lact-gui/Cargo.toml @@ -31,7 +31,7 @@ gtk = { version = "0.11.4", package = "gtk4", features = [ adw = { package = "libadwaita", version = "0.9.2", features = ["v1_5"] } relm4 = { version = "0.11.0", features = ["libadwaita"] } -relm4-components = { version = "0.11.0", features = ["libadwaita"] } +relm4-components = "0.11.0" i18n-embed = { workspace = true } i18n-embed-fl = { workspace = true }