From 3d3e257e05b1057f4f8cebce97cc831045ce04af Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Wed, 13 Sep 2023 09:31:41 +0200
Subject: [PATCH] conmon-rs: 0.6.0 -> 0.6.1

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 .../virtualization/conmon-rs/Cargo.lock.patch | 31 -------------------
 .../virtualization/conmon-rs/default.nix      |  9 ++----
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch

diff --git a/pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch b/pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch
deleted file mode 100644
index 480b76445a61..000000000000
--- a/pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 4cd154b..fee3267 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -323,7 +323,7 @@ dependencies = [
- 
- [[package]]
- name = "conmon-common"
--version = "0.5.1"
-+version = "0.6.0"
- dependencies = [
-  "capnp",
-  "capnpc",
-@@ -331,7 +331,7 @@ dependencies = [
- 
- [[package]]
- name = "conmonrs"
--version = "0.5.1"
-+version = "0.6.0"
- dependencies = [
-  "anyhow",
-  "capnp",
-@@ -376,7 +376,7 @@ dependencies = [
- 
- [[package]]
- name = "conmonrs-cli"
--version = "0.5.1"
-+version = "0.6.0"
- dependencies = [
-  "capnp",
-  "capnp-rpc",
diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix
index 84c0e3613851..7599c5eb6652 100644
--- a/pkgs/applications/virtualization/conmon-rs/default.nix
+++ b/pkgs/applications/virtualization/conmon-rs/default.nix
@@ -7,22 +7,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "conmon-rs";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-RQ3cVM7aEuCCmOCr4UWkxBMr66tdYFl0nNO7tXY05vE=";
+    sha256 = "sha256-B8uloch+ucOLIIR64GE5Z8ahe2NLqPmDGcugQVSqpl4=";
   };
 
-  # Cargo.lock is out of date for this release.
-  cargoPatches = [ ./Cargo.lock.patch ];
-
   nativeBuildInputs = [ capnproto protobuf ];
   doCheck = false;
 
-  cargoHash = "sha256-BNowZkD+y1jh25EvfhQzvT5BZzrq46KBd69AJ//9enE=";
+  cargoHash = "sha256-hEhAnNppiyY6EcdHfri534ih8VUfpT7lO9L4mFJ6Caw=";
 
   meta = with lib; {
     description = "An OCI container runtime monitor written in Rust";