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

dockerTools: fix build on Darwin

Browse Source 
Fixes #110665

Introduced by #109420
This commit is contained in:
Ozan Sener 2021-03-04 14:37:12 +01:00
parent 1b15953c03
commit 78f322f2d0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
{ lib, callPackage }: { lib, callPackage, fetchFromGitHub }:
with lib; with lib;
rec { rec {
dockerGen = { dockerGen = {
version, rev, sha256 version, rev, sha256
, mobyRev, mobySha256 , moby-src
, runcRev, runcSha256 , runcRev, runcSha256
, containerdRev, containerdSha256 , containerdRev, containerdSha256
, tiniRev, tiniSha256, buildxSupport ? false , tiniRev, tiniSha256, buildxSupport ? false
@ -65,12 +65,7 @@ rec {
inherit version; inherit version;
inherit docker-runc docker-containerd docker-proxy docker-tini; inherit docker-runc docker-containerd docker-proxy docker-tini;
src = fetchFromGitHub { src = moby-src;
owner = "moby";
repo = "moby";
rev = mobyRev;
sha256 = mobySha256;
};
goPackagePath = "github.com/docker/docker"; goPackagePath = "github.com/docker/docker";
@ -211,6 +206,9 @@ rec {
maintainers = with maintainers; [ offline tailhook vdemeester periklis ]; maintainers = with maintainers; [ offline tailhook vdemeester periklis ];
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;
}; };
# Exposed for tarsum build on non-linux systems (build-support/docker/default.nix)
inherit moby-src;
}); });
# Get revisions from # Get revisions from
@ -219,8 +217,12 @@ rec {
version = "20.10.2"; version = "20.10.2";
rev = "v${version}"; rev = "v${version}";
sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51"; sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51";
mobyRev = "v${version}"; moby-src = fetchFromGitHub {
mobySha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w"; owner = "moby";
repo = "moby";
rev = "v${version}";
sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w";
};
runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92 runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92
runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94"; runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94";
containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3 containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3

2
pkgs/build-support/docker/default.nix
View File

@ -120,7 +120,7 @@ rec {
export GOPATH=$(pwd) export GOPATH=$(pwd)
export GOCACHE="$TMPDIR/go-cache" export GOCACHE="$TMPDIR/go-cache"
mkdir -p src/github.com/docker/docker/pkg 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 go build
mkdir -p $out/bin mkdir -p $out/bin