diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-18 17:50:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-18 17:50:23 +0200 |
| commit | 4244b7391785416bbd866f4c6c980e43e7255774 (patch) | |
| tree | 22281cb567a0f6320684e136c1acb250d0ba059c /pkgs/development/compilers/go | |
| parent | 5b14758d314b4644fb1b1235a94711d596cc5bcb (diff) | |
| parent | 41a323711aca60e2a47f7e9f1c917853bdc0ba54 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/compilers/go')
| -rw-r--r-- | pkgs/development/compilers/go/1.13.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.15.nix | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index a158e1d4d3bcd..e082628aaa2ae 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.12"; + version = "1.13.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d5s5rqyzp6ykj4x1dz8infcsmj3gy8djnf63ji971ypwi6jrfhp"; + sha256 = "01mbqzn1hj8idbyn2f9gghvirfnw348dcf7pjs3ymschfblk6wqr"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 69becebe77062..cd6d5faaabbfa 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -196,8 +196,11 @@ stdenv.mkDerivation rec { export PATH=$(pwd)/bin:$PATH + ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. export CC=${buildPackages.stdenv.cc}/bin/cc + ''} ulimit -a ''; |