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

Merge pull request #37877 from srhb/tarsum-import

Browse Source 
dockerTools.tarsum: Fix upstream import
This commit is contained in:
Sarah Brofeldt 2018-03-26 19:18:39 +02:00 committed by GitHub
commit 63a8d8c9e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,8 +44,8 @@ rec {
cp ${./tarsum.go} tarsum.go cp ${./tarsum.go} tarsum.go
export GOPATH=$(pwd) export GOPATH=$(pwd)
mkdir src mkdir -p src/github.com/docker/docker/pkg
ln -sT ${docker.src}/components/engine/pkg/tarsum src/tarsum ln -sT ${docker.src}/components/engine/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
go build go build
cp tarsum $out cp tarsum $out

2
pkgs/build-support/docker/tarsum.go
View File

@ -5,7 +5,7 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
"tarsum" "github.com/docker/docker/pkg/tarsum"
) )
func main() { func main() {