diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2021-02-01 00:55:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 00:55:22 +0100 |
commit | ad5f23870caf2463603452084505ae2cf6fe5cdf (patch) | |
tree | f0e98dead9f7466cf9327f413cf879d614930c0e /pkgs/applications/virtualization | |
parent | ebf0764ad73cc67b305bb4f01421f70f3e68f5fb (diff) | |
parent | ed46383416a21ef496c6b52bc89d80f28c2efcad (diff) | |
download | nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.tar nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.tar.gz nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.tar.bz2 nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.tar.lz nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.tar.xz nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.tar.zst nixlib-ad5f23870caf2463603452084505ae2cf6fe5cdf.zip |
Merge pull request #110847 from andir/docker-overrides
docker: allow overriding package inputs per docker package
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e9496247f06d..207ebdf2211f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,12 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage -, makeWrapper, installShellFiles, pkg-config -, go-md2man, go, containerd, runc, docker-proxy, tini, libtool -, sqlite, iproute, lvm2, systemd, docker-buildx -, btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git -, procps, libseccomp -, nixosTests -, buildxSupport ? false -}: +{ lib, callPackage }: with lib; @@ -16,8 +8,16 @@ rec { , mobyRev, mobySha256 , runcRev, runcSha256 , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport - } : + , tiniRev, tiniSha256, buildxSupport ? false + # package dependencies + , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage + , makeWrapper, installShellFiles, pkg-config + , go-md2man, go, containerd, runc, docker-proxy, tini, libtool + , sqlite, iproute, lvm2, systemd, docker-buildx + , btrfs-progs, iptables, e2fsprogs, xz, util-linux, xfsprogs, git + , procps, libseccomp + , nixosTests + }: let docker-runc = runc.overrideAttrs (oldAttrs: { name = "docker-runc-${version}"; @@ -215,7 +215,7 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* - docker_20_10 = makeOverridable dockerGen rec { + docker_20_10 = callPackage dockerGen rec { version = "20.10.2"; rev = "v${version}"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; @@ -227,6 +227,5 @@ rec { containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0"; tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0 tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; - inherit buildxSupport; }; } |