From b18e7a1813647896bbdcbe726ef7a71a75ca5dc9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 2 Aug 2022 08:05:07 +1000 Subject: [PATCH] Revert "go_1_18: backport CL417615" This reverts commit 4d1e04c00fe2ab1dd485ae198be56f97b7fff41f. fixed in 1.18.5 --- pkgs/development/compilers/go/1.18.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 644e407b9cbc..d36cbc5e3c29 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , tzdata , iana-etc @@ -173,11 +172,7 @@ stdenv.mkDerivation rec { touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd ''; - patches = let - fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: { - postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; - }); - in [ + patches = [ ./remove-tools-1.11.patch ./ssl-cert-file-1.16.patch ./remove-test-pie-1.15.patch @@ -187,12 +182,6 @@ stdenv.mkDerivation rec { ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch ./go_no_vendor_checks-1.16.patch - - # https://go-review.googlesource.com/c/go/+/417615/ - (fetchBase64Patch { - url = "https://go-review.googlesource.com/changes/go~417615/revisions/3/patch"; - sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs="; - }) ]; postPatch = ''