diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-10-16 10:38:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-10-16 10:49:23 +0200 |
| commit | 610afbca84a34283fb71acf6f215731c403c3555 (patch) | |
| tree | 495f1c2e417fabc472a95cec1ecf55171a552d7a /pkgs/development/compilers/go | |
| parent | cffba01e12661ab91252be03a07567db7d1f0f29 (diff) | |
| download | nixlib-610afbca84a34283fb71acf6f215731c403c3555.tar nixlib-610afbca84a34283fb71acf6f215731c403c3555.tar.gz nixlib-610afbca84a34283fb71acf6f215731c403c3555.tar.bz2 nixlib-610afbca84a34283fb71acf6f215731c403c3555.tar.lz nixlib-610afbca84a34283fb71acf6f215731c403c3555.tar.xz nixlib-610afbca84a34283fb71acf6f215731c403c3555.tar.zst nixlib-610afbca84a34283fb71acf6f215731c403c3555.zip | |
Revert "go: apply upstream patch"
This reverts commit d8218de5c53c5b1984d27f37182ced01a88808b0. It makes no sense after the parent commit.
Diffstat (limited to 'pkgs/development/compilers/go')
| -rw-r--r-- | pkgs/development/compilers/go/1.12.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index a1476c36abba..ce8d0223714e 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 = '' |