From 610afbca84a34283fb71acf6f215731c403c3555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 16 Oct 2019 10:38:39 +0200 Subject: [PATCH] Revert "go: apply upstream patch" This reverts commit d8218de5c53c5b1984d27f37182ced01a88808b0. It makes no sense after the parent commit. --- pkgs/development/compilers/go/1.12.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index a1476c36abb..ce8d0223714 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, tzdata, iana-etc, runCommand +{ stdenv, fetchurl, tzdata, iana-etc, runCommand , perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation , mailcap, runtimeShell , buildPackages, pkgsTargetTarget @@ -143,11 +143,6 @@ stdenv.mkDerivation rec { ./skip-nohup-tests.patch # breaks under load: https://github.com/golang/go/issues/25628 ./skip-test-extra-files-on-386.patch - (fetchpatch { # probably included in >= 1.12.10 - url = "https://github.com/golang/go/commit/aae0b5b0b.diff"; - name = "TestGcSys-too-much-memory.diff"; - sha256 = "1bl9d2pl6n99n9g65cq91sygmp1iva5rmrxbprwn4xd0ql36psa8"; - }) ]; postPatch = ''