Merge pull request #254899 from saschagrunert/conmon-rs

conmon-rs: 0.6.0 -> 0.6.1
This commit is contained in:
Mario Rodas 2023-09-13 06:39:30 -05:00 committed by GitHub
commit 54721761e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 37 deletions

View File

@ -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",

View File

@ -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";