summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxine [they] <35892750+maxeaubrey@users.noreply.github.com>2022-06-11 00:48:42 +0200
committerGitHub <noreply@github.com>2022-06-11 00:48:42 +0200
commit20bdb91aac4815b012f4ba8da8da2c74157745a4 (patch)
treedc5587c0812405fcc615f96d8fa8ff0d88d72d20
parentMerge pull request #177176 from NixOS/backport-177112-to-release-22.05 (diff)
parentdocker: 20.10.16 -> 20.10.17 (diff)
downloadnixpkgs-20bdb91aac4815b012f4ba8da8da2c74157745a4.tar.gz
Merge pull request #177221 from NixOS/backport-177218-to-release-22.05
-rw-r--r--pkgs/applications/virtualization/docker/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 68f1ff45d144..b6309814429d 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -243,19 +243,19 @@ rec {
# Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec {
- version = "20.10.16";
+ version = "20.10.17";
rev = "v${version}";
- sha256 = "sha256-Sktjh1JabeXrmWljLe5G934cxgChN0u3vdmQXasEFro=";
+ sha256 = "sha256-YCuohqtE4rbGyboVRyxvpqs93IS1k7aUTPdtHIlkUU8=";
moby-src = fetchFromGitHub {
owner = "moby";
repo = "moby";
rev = "v${version}";
- sha256 = "sha256-3dog2aGbFKiYzsPTXkG+bo9xjTWZYlmWxtrqXjdzO2s=";
+ sha256 = "sha256-7SQubrbMvXSN3blcCW47F9OnjuKZxdXM5O/lE85zx0I=";
};
- runcRev = "v1.1.1";
- runcSha256 = "sha256-6g2km+Y45INo2MTWMFFQFhfF8DAR5Su+YrJS8k3LYBY=";
- containerdRev = "v1.6.4";
- containerdSha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";
+ runcRev = "v1.1.2";
+ runcSha256 = "sha256-tMneqB81w8lQp5RWWCjALyKbOY3xog+oqb6cYKasG/8=";
+ containerdRev = "v1.6.6";
+ containerdSha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8=";
tiniRev = "v0.19.0";
tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI=";
};