diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-03-26 19:18:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 19:18:39 +0200 |
| commit | 63a8d8c9e2d79f5286b37e9e6e9a45cce748719e (patch) | |
| tree | c8864320d83231687c83c1df872565050f8e41fb | |
| parent | 8fe59b5b297543c1186190bda7ba1b2ac29876a2 (diff) | |
| parent | 4874ce17019cb815a7f8bf6fd1d23b453faa2a01 (diff) | |
| download | nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.tar nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.tar.gz nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.tar.bz2 nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.tar.lz nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.tar.xz nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.tar.zst nixlib-63a8d8c9e2d79f5286b37e9e6e9a45cce748719e.zip | |
Merge pull request #37877 from srhb/tarsum-import
dockerTools.tarsum: Fix upstream import
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 4 | ||||
| -rw-r--r-- | 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() { |