summary refs log tree commit diff
path: root/pkgs/applications/virtualization
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-20 06:01:02 +0000
committerGitHub <noreply@github.com>2021-07-20 06:01:02 +0000
commit680d6a235f27ff78e728cff4fcf3eba3f6a65727 (patch)
tree7ce1a2dac574a6a741b3c558e5dd06421d1fb22a /pkgs/applications/virtualization
parentfcf9b87af053cc71743f6e2c4507073c40246099 (diff)
parent8e6c4f9a2ec1febe7f644dd3be9af597c14c9e7c (diff)
downloadnixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.tar
nixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.tar.gz
nixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.tar.bz2
nixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.tar.lz
nixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.tar.xz
nixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.tar.zst
nixpkgs-680d6a235f27ff78e728cff4fcf3eba3f6a65727.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/containerd/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index ca9ae20f346..0c44805bedd 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "containerd";
-  version = "1.5.2";
+  version = "1.5.4";
 
   outputs = [ "out" "man" ];
 
@@ -18,7 +18,7 @@ buildGoModule rec {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als=";
+    sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA=";
   };
 
   vendorSha256 = null;