diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
| commit | 899a451e08f7d6d2c8214d119c2a0316849a0ed4 (patch) | |
| tree | 5e72a7288b7d2b33fead36fbfe91a02a48ff7fef /nixpkgs/pkgs/development/compilers/go/1.12.nix | |
| parent | 5962418b6543dfb3ca34965c0fa16dd77543801b (diff) | |
| parent | a21c2fa3ea2b88e698db6fc151d9c7259ae14d96 (diff) | |
Merge commit 'a21c2fa3ea2b88e698db6fc151d9c7259ae14d96'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/go/1.12.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/go/1.12.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/compilers/go/1.12.nix b/nixpkgs/pkgs/development/compilers/go/1.12.nix index b3b66fde2a1..0a684a3a49e 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.12.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.12.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.12.10"; + version = "1.12.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0m1rvawvpdl7kd0asw10m50xbxlhykix6dng9p4x6ih6x3y4hvpm"; + sha256 = "1hw4xjywcl883dnvfbb92w85sy8n231fdri4aynj8xajgr0p9fla"; }; # perl is used for testing go vet @@ -141,8 +141,11 @@ stdenv.mkDerivation rec { ./go-1.9-skip-flaky-20072.patch ./skip-external-network-tests.patch ./skip-nohup-tests.patch + ] ++ [ # breaks under load: https://github.com/golang/go/issues/25628 - ./skip-test-extra-files-on-386.patch + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) ]; postPatch = '' |