summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2023-09-13 06:39:30 -0500
committerGitHub <noreply@github.com>2023-09-13 06:39:30 -0500
commit54721761e4164a2acb64561553888a83ac9762f1 (patch)
treea4f437fb75aff9331af913e814677f7c839cf547 /pkgs/applications/virtualization
parentf289110bab75a00ec5c08895fbcaefa785f0c364 (diff)
parent3d3e257e05b1057f4f8cebce97cc831045ce04af (diff)
downloadnixpkgs-54721761e4164a2acb64561553888a83ac9762f1.tar
nixpkgs-54721761e4164a2acb64561553888a83ac9762f1.tar.gz
nixpkgs-54721761e4164a2acb64561553888a83ac9762f1.tar.bz2
nixpkgs-54721761e4164a2acb64561553888a83ac9762f1.tar.lz
nixpkgs-54721761e4164a2acb64561553888a83ac9762f1.tar.xz
nixpkgs-54721761e4164a2acb64561553888a83ac9762f1.tar.zst
nixpkgs-54721761e4164a2acb64561553888a83ac9762f1.zip
Merge pull request #254899 from saschagrunert/conmon-rs
conmon-rs: 0.6.0 -> 0.6.1
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/conmon-rs/Cargo.lock.patch31
-rw-r--r--pkgs/applications/virtualization/conmon-rs/default.nix9
2 files changed, 3 insertions, 37 deletions
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 480b76445a6..00000000000
--- 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 84c0e361385..7599c5eb665 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";