From 4874ce17019cb815a7f8bf6fd1d23b453faa2a01 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Mon, 26 Mar 2018 18:47:31 +0200 Subject: [PATCH] dockerTools.tarsum: Fix upstream import --- pkgs/build-support/docker/default.nix | 4 ++-- pkgs/build-support/docker/tarsum.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 653a651df7bd..f531f1349c68 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -44,8 +44,8 @@ rec { cp ${./tarsum.go} tarsum.go export GOPATH=$(pwd) - mkdir src - ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum + mkdir -p src/github.com/docker/docker/pkg + ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum go build cp tarsum $out diff --git a/pkgs/build-support/docker/tarsum.go b/pkgs/build-support/docker/tarsum.go index ad33bbac75b4..f91a90bdbdab 100644 --- a/pkgs/build-support/docker/tarsum.go +++ b/pkgs/build-support/docker/tarsum.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" "os" - "tarsum" + "github.com/docker/docker/pkg/tarsum" ) func main() {