Merge pull request #253238 from saschagrunert/conmon-rs

conmon-rs: 0.5.0 -> 0.6.0
This commit is contained in:
Weijia Wang 2023-09-06 15:53:07 +02:00 committed by GitHub
commit 92df924668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 3 deletions

View file

@ -0,0 +1,31 @@
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",

View file

@ -7,19 +7,22 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "conmon-rs"; pname = "conmon-rs";
version = "0.5.0"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ="; sha256 = "sha256-RQ3cVM7aEuCCmOCr4UWkxBMr66tdYFl0nNO7tXY05vE=";
}; };
# Cargo.lock is out of date for this release.
cargoPatches = [ ./Cargo.lock.patch ];
nativeBuildInputs = [ capnproto protobuf ]; nativeBuildInputs = [ capnproto protobuf ];
doCheck = false; doCheck = false;
cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; cargoHash = "sha256-BNowZkD+y1jh25EvfhQzvT5BZzrq46KBd69AJ//9enE=";
meta = with lib; { meta = with lib; {
description = "An OCI container runtime monitor written in Rust"; description = "An OCI container runtime monitor written in Rust";