diff options
| author | maxine <35892750+maxeaubrey@users.noreply.github.com> | 2022-10-03 11:51:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 11:51:48 +0200 |
| commit | 81a3237b64e67b66901c735654017e75f0c50943 (patch) | |
| tree | f4e339956c3868c0decdb005bc3642454158dc11 | |
| parent | gajim: 1.4.7 → 1.5.1 (diff) | |
| parent | docker: fix build by using go 1.18 (diff) | |
| download | nixpkgs-81a3237b64e67b66901c735654017e75f0c50943.tar.gz | |
Merge pull request #194191 from vcunat/p/docker-22.05
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 2059be473adb..546cb61aeb9c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -10,9 +10,9 @@ rec { , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true # package dependencies - , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , stdenv, fetchFromGitHub, fetchpatch, buildGo118Package , makeWrapper, installShellFiles, pkg-config, glibc - , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , go-md2man, go_1_18, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute2, lvm2, systemd, docker-buildx, docker-compose_2 , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, libseccomp, rootlesskit, slirp4netns, fuse-overlayfs @@ -20,6 +20,9 @@ rec { , clientOnly ? !stdenv.isLinux, symlinkJoin }: let + go = go_1_18; + buildGoPackage = buildGo118Package; + docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; inherit version; |