mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 12:53:05 +00:00
Revert "go_1_18: backport CL417615"
This reverts commit 4d1e04c00f
.
fixed in 1.18.5
This commit is contained in:
parent
d0fae49900
commit
b18e7a1813
@ -1,6 +1,5 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchpatch
|
|
||||||
, fetchurl
|
, fetchurl
|
||||||
, tzdata
|
, tzdata
|
||||||
, iana-etc
|
, iana-etc
|
||||||
@ -173,11 +172,7 @@ stdenv.mkDerivation rec {
|
|||||||
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patches = let
|
patches = [
|
||||||
fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: {
|
|
||||||
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
|
|
||||||
});
|
|
||||||
in [
|
|
||||||
./remove-tools-1.11.patch
|
./remove-tools-1.11.patch
|
||||||
./ssl-cert-file-1.16.patch
|
./ssl-cert-file-1.16.patch
|
||||||
./remove-test-pie-1.15.patch
|
./remove-test-pie-1.15.patch
|
||||||
@ -187,12 +182,6 @@ stdenv.mkDerivation rec {
|
|||||||
./skip-nohup-tests.patch
|
./skip-nohup-tests.patch
|
||||||
./skip-cgo-tests-1.15.patch
|
./skip-cgo-tests-1.15.patch
|
||||||
./go_no_vendor_checks-1.16.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 = ''
|
postPatch = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user