diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-27 09:14:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-27 09:14:22 +0100 |
| commit | 2d2dbe083f0df9dbde5643234cb2b067653739fa (patch) | |
| tree | 66195da25376f3bb7bed16d469d85fcaffe0f13b /pkgs/development/compilers/go/1.9.nix | |
| parent | ef60e411455c9d7ef16069df63daf2c9fbd66ec6 (diff) | |
| parent | 9c95eb828ab6cc7b022197f68e1e0a8ce4241d89 (diff) | |
| download | nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.gz nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.bz2 nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.lz nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.xz nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.tar.zst nixlib-2d2dbe083f0df9dbde5643234cb2b067653739fa.zip | |
Merge branch 'master' into staging
Hydra: ?compare=1429281
Diffstat (limited to 'pkgs/development/compilers/go/1.9.nix')
| -rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index aab7964148b4..b226cd7a7ebc 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i"; + sha256 = "0ivb6z30d6qrrkwjm9fdz9jfs567q4b6dljwwxc9shmdr2l9chah"; }; # perl is used for testing go vet @@ -139,6 +139,8 @@ stdenv.mkDerivation rec { GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; # The go build actually checks for CC=*/clang and does something different, so we don't # just want the generic `cc` here. |