diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2021-03-04 16:50:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 16:50:26 +0100 |
commit | f3d006c1d4c5ef36ff4c5abce055e85e112cbe74 (patch) | |
tree | cc3ef830bb87244f8ef8a1675a190466e5e294dc /pkgs | |
parent | 1b1bdeac67f6b63a1a5527c4be3081ae7097f693 (diff) | |
parent | 78f322f2d0e41fb72ee617e6dda0596845dba695 (diff) | |
download | nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.tar nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.tar.gz nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.tar.bz2 nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.tar.lz nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.tar.xz nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.tar.zst nixpkgs-f3d006c1d4c5ef36ff4c5abce055e85e112cbe74.zip |
Merge pull request #115083 from osener/fix-dockertools-on-darwin
dockerTools: fix build on Darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 22 | ||||
-rw-r--r-- | pkgs/build-support/docker/default.nix | 2 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 207ebdf2211..73f4812ee59 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,11 +1,11 @@ -{ lib, callPackage }: +{ lib, callPackage, fetchFromGitHub }: with lib; rec { dockerGen = { version, rev, sha256 - , mobyRev, mobySha256 + , moby-src , runcRev, runcSha256 , containerdRev, containerdSha256 , tiniRev, tiniSha256, buildxSupport ? false @@ -65,12 +65,7 @@ rec { inherit version; inherit docker-runc docker-containerd docker-proxy docker-tini; - src = fetchFromGitHub { - owner = "moby"; - repo = "moby"; - rev = mobyRev; - sha256 = mobySha256; - }; + src = moby-src; goPackagePath = "github.com/docker/docker"; @@ -211,6 +206,9 @@ rec { maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; platforms = with platforms; linux ++ darwin; }; + + # Exposed for tarsum build on non-linux systems (build-support/docker/default.nix) + inherit moby-src; }); # Get revisions from @@ -219,8 +217,12 @@ rec { version = "20.10.2"; rev = "v${version}"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; - mobyRev = "v${version}"; - mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = "v${version}"; + sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; + }; runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index da3e7b96010..4d57b399199 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -119,7 +119,7 @@ rec { export GOPATH=$(pwd) export GOCACHE="$TMPDIR/go-cache" mkdir -p src/github.com/docker/docker/pkg - ln -sT ${docker.moby.src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum + ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build mkdir -p $out/bin |