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: 69af83b20274
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53255e2ab723
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 12, 2018

  1. go: do not wrap with go get tools 

    See: #46603

These tools are not required for `buildGoPackage`, while
significantly affecting closure size and build time.

This essentially reverts 458895d.
    @lukateras
    lukateras committed Oct 12, 2018
    Copy the full SHA
    f969e6e View commit details

Commits on Oct 13, 2018

  1. Merge pull request #48284 from transumption/201810/go-closure-size 

    go: do not wrap with `go get` tools
    @Mic92
    Mic92 authored Oct 13, 2018
    Copy the full SHA
    53255e2 View commit details
Showing with 6 additions and 24 deletions.
  1. +2 −8 pkgs/development/compilers/go/1.10.nix
  2. +2 −8 pkgs/development/compilers/go/1.11.nix
  3. +2 −8 pkgs/development/compilers/go/1.9.nix
10 changes: 2 additions & 8 deletions pkgs/development/compilers/go/1.10.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps
, pcre, cacert, llvm
, Security, Foundation
, makeWrapper, git, subversion, mercurial, bazaar }:
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:

let

@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
GOCACHE = "off";

# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
installPhase = ''
cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash )
# (https://github.com/golang/go/wiki/GoGetTools)
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
'';

preFixup = ''
10 changes: 2 additions & 8 deletions pkgs/development/compilers/go/1.11.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps
, pcre, cacert, llvm
, Security, Foundation
, makeWrapper, git, subversion, mercurial, bazaar }:
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:

let

@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
GOCACHE = "off";

# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -171,9 +168,6 @@ stdenv.mkDerivation rec {
installPhase = ''
cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash )
# (https://github.com/golang/go/wiki/GoGetTools)
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
'';

preFixup = ''
10 changes: 2 additions & 8 deletions pkgs/development/compilers/go/1.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
, perl, which, pkgconfig, patch, procps
, pcre, cacert, llvm
, Security, Foundation
, makeWrapper, git, subversion, mercurial, bazaar }:
, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:

let

@@ -35,7 +32,7 @@ stdenv.mkDerivation rec {
};

# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ];
nativeBuildInputs = [ perl which pkgconfig patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
@@ -165,9 +162,6 @@ stdenv.mkDerivation rec {
installPhase = ''
cp -r . $GOROOT
( cd $GOROOT/src && ./all.bash )
# (https://github.com/golang/go/wiki/GoGetTools)
wrapProgram $out/share/go/bin/go --prefix PATH ":" "${stdenv.lib.makeBinPath [ git subversion mercurial bazaar ]}"
'';

preFixup = ''