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 18:01:04 +0000
committerGitHub <noreply@github.com>2021-07-20 18:01:04 +0000
commit61eb7e2e9e36e062a3bd323155441f78e9fcd7ed (patch)
tree95a0c82b7250621868f016fc7c0995d6ae09fd8b /pkgs/applications/virtualization
parent3202dd166c491b8389c130d80dde3a377f650741 (diff)
parent8472d44b82084f8b638b0dca248fae61b9bd1bad (diff)
downloadnixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.tar
nixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.tar.gz
nixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.tar.bz2
nixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.tar.lz
nixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.tar.xz
nixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.tar.zst
nixpkgs-61eb7e2e9e36e062a3bd323155441f78e9fcd7ed.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r--pkgs/applications/virtualization/cri-o/default.nix4
-rw-r--r--pkgs/applications/virtualization/docker/buildx.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 42095da8f52..26e56ccc609 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.21.1";
+  version = "1.21.2";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "sha256-WoQeZkHuCQGv//UKTpvucJXq7xI9Fkil8V1B1qTM75k=";
+    sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI=";
   };
   vendorSha256 = null;
 
diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix
index 84019395853..020e22db601 100644
--- a/pkgs/applications/virtualization/docker/buildx.nix
+++ b/pkgs/applications/virtualization/docker/buildx.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-buildx";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "buildx";
     rev = "v${version}";
-    sha256 = "0l03ncs1x4lhgy0kf7bd1zq00md8fi93f8xq6k0ans4400divfzk";
+    sha256 = "sha256-5j1+3FlLc0gYDnYvDsAdmILxgjHCU1bTVOytfaF03iU=";
   };
 
   vendorSha256 = null;