Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2d3455ec0e3c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ced8811749c4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 5, 2019

  1. build-support/docker: fix the build of tarsum with Go 1.12

    @kalbasit
    kalbasit committed Mar 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9b22a51 View commit details

  2. Merge pull request #56902 from kalbasit/nixpkgs_fix-build-support-doc… 

    …ker-go-1-12

build-support/docker: fix the build of tarsum with Go 1.12
    @Mic92
    Mic92 authored Mar 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ced8811 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/build-support/docker/default.nix
1 change: 1 addition & 0 deletions pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -77,6 +77,7 @@ rec {
cp ${./tarsum.go} tarsum.go
export GOPATH=$(pwd)
export GOCACHE="$TMPDIR/go-cache"
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