From ce06f20e84080ed0d09fa9d722460b8c03df4270 Mon Sep 17 00:00:00 2001
From: geri1701 <geri@sdf.org>
Date: Thu, 18 May 2023 10:18:25 +0200
Subject: [PATCH] amdgpu_top: 0.1.7-stable -> 0.1.8

---
 pkgs/tools/system/amdgpu_top/Cargo.lock  | 73 +++++++++++++-----------
 pkgs/tools/system/amdgpu_top/default.nix |  6 +-
 2 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/system/amdgpu_top/Cargo.lock b/pkgs/tools/system/amdgpu_top/Cargo.lock
index c27927c2b1d5..296f2e77cf63 100644
--- a/pkgs/tools/system/amdgpu_top/Cargo.lock
+++ b/pkgs/tools/system/amdgpu_top/Cargo.lock
@@ -38,15 +38,38 @@ dependencies = [
 
 [[package]]
 name = "amdgpu_top"
-version = "0.1.7"
+version = "0.1.8"
+dependencies = [
+ "amdgpu_top_gui",
+ "amdgpu_top_json",
+ "amdgpu_top_tui",
+ "libamdgpu_top",
+]
+
+[[package]]
+name = "amdgpu_top_gui"
+version = "0.1.0"
 dependencies = [
- "ctrlc",
- "cursive",
  "eframe",
- "libdrm_amdgpu_sys",
+ "libamdgpu_top",
+]
+
+[[package]]
+name = "amdgpu_top_json"
+version = "0.1.0"
+dependencies = [
+ "libamdgpu_top",
  "serde_json",
 ]
 
+[[package]]
+name = "amdgpu_top_tui"
+version = "0.1.0"
+dependencies = [
+ "cursive",
+ "libamdgpu_top",
+]
+
 [[package]]
 name = "android-activity"
 version = "0.4.1"
@@ -71,6 +94,12 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04"
 
+[[package]]
+name = "anyhow"
+version = "1.0.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+
 [[package]]
 name = "arboard"
 version = "3.2.0"
@@ -340,16 +369,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "ctrlc"
-version = "3.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639"
-dependencies = [
- "nix 0.26.2",
- "windows-sys",
-]
-
 [[package]]
 name = "cursive"
 version = "0.20.0"
@@ -875,6 +894,14 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "libamdgpu_top"
+version = "0.1.7"
+dependencies = [
+ "anyhow",
+ "libdrm_amdgpu_sys",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.141"
@@ -1040,18 +1067,6 @@ dependencies = [
  "memoffset",
 ]
 
-[[package]]
-name = "nix"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
- "static_assertions",
-]
-
 [[package]]
 name = "nohash-hasher"
 version = "0.2.0"
@@ -1512,12 +1527,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
 [[package]]
 name = "str-buf"
 version = "1.0.6"
diff --git a/pkgs/tools/system/amdgpu_top/default.nix b/pkgs/tools/system/amdgpu_top/default.nix
index 8355486ff540..25f2f8d9769c 100644
--- a/pkgs/tools/system/amdgpu_top/default.nix
+++ b/pkgs/tools/system/amdgpu_top/default.nix
@@ -14,13 +14,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "amdgpu_top";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "Umio-Yasuno";
     repo = pname;
-    rev = "v${version}-stable";
-    hash = "sha256-cdKUj0pUlXxMNx0jypuov4hX3CISTDaSQh+KFB5R8ys=";
+    rev = "v${version}";
+    hash = "sha256-QsoOqkRtIwkLn7zg4hggGLNzyjdneYYs0XfQMdIEcCM=";
   };
 
   cargoLock.lockFile = ./Cargo.lock;