nixpkgs/pkgs/by-name/rq/rquickshare/remove-duplicate-versions-of-sys-metrics.patch
2025-01-21 15:39:44 +01:00

117 lines
3.7 KiB
Diff

diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock
index 1bba0ae..af24986 100644
--- a/app/legacy/src-tauri/Cargo.lock
+++ b/app/legacy/src-tauri/Cargo.lock
@@ -4138,7 +4138,7 @@ dependencies = [
"rand 0.8.5",
"serde",
"sha2",
- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
+ "sys_metrics",
"tokio",
"tokio-util",
"tracing-subscriber",
@@ -4158,7 +4158,7 @@ dependencies = [
"rqs_lib",
"serde",
"serde_json",
- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_metrics",
"tauri",
"tauri-build",
"tauri-plugin-autostart",
@@ -4759,22 +4759,7 @@ dependencies = [
[[package]]
name = "sys_metrics"
version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
-dependencies = [
- "core-foundation-sys",
- "glob",
- "io-kit-sys",
- "lazy_static",
- "libc",
- "mach",
- "serde",
-]
-
-[[package]]
-name = "sys_metrics"
-version = "0.2.7"
-source = "git+https://github.com/Martichou/sys_metrics#c0f4ec7b9156d3ab83ee61276984c7fd4e632098"
+source = "git+https://github.com/Martichou/sys_metrics#e5b324a17d1724bd97923a173c3535cc06a44b0c"
dependencies = [
"core-foundation-sys",
"glob",
diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml
index b971c3d..44abf29 100644
--- a/app/legacy/src-tauri/Cargo.toml
+++ b/app/legacy/src-tauri/Cargo.toml
@@ -20,7 +20,7 @@ notify-rust = "4.10"
rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-sys_metrics = "0.2"
+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
tauri = { version = "1.5", features = ["api-all", "reqwest-native-tls-vendored", "system-tray", "devtools"] }
tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock
index bc4753a..ed4c7e8 100644
--- a/app/main/src-tauri/Cargo.lock
+++ b/app/main/src-tauri/Cargo.lock
@@ -4182,7 +4182,7 @@ dependencies = [
"rand 0.8.5",
"serde",
"sha2",
- "sys_metrics 0.2.7 (git+https://github.com/Martichou/sys_metrics)",
+ "sys_metrics",
"tokio",
"tokio-util",
"tracing-subscriber",
@@ -4202,7 +4202,7 @@ dependencies = [
"rqs_lib",
"serde",
"serde_json",
- "sys_metrics 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sys_metrics",
"tauri",
"tauri-build",
"tauri-plugin-autostart",
@@ -4867,21 +4867,6 @@ dependencies = [
"syn 2.0.95",
]
-[[package]]
-name = "sys_metrics"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b266b80f59f86e2e1e0a4938e316e32c3730d94a749f236305152279f77484"
-dependencies = [
- "core-foundation-sys",
- "glob",
- "io-kit-sys",
- "lazy_static",
- "libc",
- "mach",
- "serde",
-]
-
[[package]]
name = "sys_metrics"
version = "0.2.7"
diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml
index 5653700..5120513 100644
--- a/app/main/src-tauri/Cargo.toml
+++ b/app/main/src-tauri/Cargo.toml
@@ -20,7 +20,7 @@ notify-rust = "4.10"
rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
-sys_metrics = "0.2"
+sys_metrics = { git = "https://github.com/Martichou/sys_metrics" }
tauri = { version = "2.2", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] }
tauri-plugin-autostart = "2.2"
tauri-plugin-process = "2.2"