diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-06 15:53:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-06 15:53:07 +0200 |
commit | 92df924668113433b0aae64c5606b1146b1621fa (patch) | |
tree | 37b9cc71b3b4e544027e43af3ff8e53969f8a6a4 /pkgs/applications/virtualization | |
parent | 4c87ec61965d5cd6b8e772937a88959d101b8933 (diff) | |
parent | 2fefc49874bd395a24995a81761952fecdf28d89 (diff) |
Merge pull request #253238 from saschagrunert/conmon-rs
conmon-rs: 0.5.0 -> 0.6.0
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch | 31 | ||||
-rw-r--r-- | pkgs/applications/virtualization/conmon-rs/default.nix | 9 |
2 files changed, 37 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch b/pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch new file mode 100644 index 0000000000000..480b76445a612 --- /dev/null +++ b/pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch @@ -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", diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index ef25427c4a234..84c0e36138510 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,22 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; 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 ]; doCheck = false; - cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; + cargoHash = "sha256-BNowZkD+y1jh25EvfhQzvT5BZzrq46KBd69AJ//9enE="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; |