Merge pull request #56500 from kalbasit/nixpkgs_add-support-go-1-12

go_1_12: init at go 1.12
2019-03-04 14:22:27 +00:00
parent 1673a3c939 252376c617
commit 27cb0669c6
14 changed files with 278 additions and 11 deletions
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -100,6 +100,7 @@ rec {
      export AUTO_GOPATH=1
      export DOCKER_GITCOMMIT="${rev}"
      export VERSION="${version}"
+      export GOCACHE="$TMPDIR/go-cache"
      ./hack/make.sh dynbinary
      cd -
    '') + ''
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -48,6 +48,7 @@ in stdenv.mkDerivation rec {

  preBuild = ''
    export BUILDDIR
+    export GOCACHE="$TMPDIR/go-cache"
  '';

  installPhase = ''