public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #130289 from NixOS/backport-123291-to-release-21.05

Browse Source 
[Backport release-21.05] docker: 20.10.2 -> 20.10.6
This commit is contained in:
Luke Granger-Brown 2021-07-25 10:12:27 +01:00 committed by GitHub
commit 3af6b9cbe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/virtualization/docker/default.nix
View File

@ -10,7 +10,7 @@ rec {
, containerdRev, containerdSha256 , containerdRev, containerdSha256
, tiniRev, tiniSha256, buildxSupport ? false , tiniRev, tiniSha256, buildxSupport ? false
# package dependencies # package dependencies
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , stdenv, fetchFromGitHub, buildGoPackage
, makeWrapper, installShellFiles, pkg-config , makeWrapper, installShellFiles, pkg-config
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
, sqlite, iproute2, lvm2, systemd, docker-buildx , sqlite, iproute2, lvm2, systemd, docker-buildx
@ -124,7 +124,7 @@ rec {
}) // rec { }) // rec {
inherit version rev; inherit version rev;
name = "docker-${version}"; pname = "docker";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
@ -163,8 +163,6 @@ rec {
postPatch = '' postPatch = ''
patchShebangs . patchShebangs .
substituteInPlace ./scripts/build/.variables --replace "set -eu" "" substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man
'' + optionalString buildxSupport '' '' + optionalString buildxSupport ''
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \ substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]} ${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
@ -222,19 +220,19 @@ rec {
# Get revisions from # Get revisions from
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
docker_20_10 = callPackage dockerGen rec { docker_20_10 = callPackage dockerGen rec {
version = "20.10.2"; version = "20.10.6";
rev = "v${version}"; rev = "v${version}";
sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl";
moby-src = fetchFromGitHub { moby-src = fetchFromGitHub {
owner = "moby"; owner = "moby";
repo = "moby"; repo = "moby";
rev = "v${version}"; rev = "v${version}";
sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk";
}; };
runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95
runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb";
containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1
containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d";
tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
}; };