about summary refs log tree commit diff
path: root/pkgs/development/compilers/go
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-02-19 11:35:54 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-02-19 11:35:54 +0100
commit4851a04deb9022aae961dd428944feabca2a7d86 (patch)
treed6bdebeee9887b5a2c0f7dc1149de0798801482c /pkgs/development/compilers/go
parent98be12ab3aa2d1eece1c4daf86dcd2d66f9454a4 (diff)
downloadnixlib-4851a04deb9022aae961dd428944feabca2a7d86.tar
nixlib-4851a04deb9022aae961dd428944feabca2a7d86.tar.gz
nixlib-4851a04deb9022aae961dd428944feabca2a7d86.tar.bz2
nixlib-4851a04deb9022aae961dd428944feabca2a7d86.tar.lz
nixlib-4851a04deb9022aae961dd428944feabca2a7d86.tar.xz
nixlib-4851a04deb9022aae961dd428944feabca2a7d86.tar.zst
nixlib-4851a04deb9022aae961dd428944feabca2a7d86.zip
go_1_10: fix tests after binutils update
Diffstat (limited to 'pkgs/development/compilers/go')
-rw-r--r--pkgs/development/compilers/go/1.10.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 867344e84da4..5dce1529a8b8 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin
-, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation }:
+, perl, which, pkgconfig, patch, procps, pcre, cacert, llvm, Security, Foundation
+, fetchpatch
+}:
 
 let
 
@@ -122,6 +124,11 @@ stdenv.mkDerivation rec {
     ./creds-test.patch
     ./go-1.9-skip-flaky-19608.patch
     ./go-1.9-skip-flaky-20072.patch
+    (fetchpatch {
+      name = "missing_cpuHog_in_pprof_output.diff";
+      url = "https://github.com/golang/go/commit/33110e2c.diff";
+      sha256 = "04vh9lflbpz9xjvymyzhd91gkxiiwwz4lhglzl3r8z0lk45p96qn";
+    })
   ];
 
   postPatch = optionalString stdenv.isDarwin ''