go_1_14, go_1_15: support colon at start of TZ

See also: https://github.com/NixOS/nixpkgs/pull/113555

Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
This commit is contained in:
Masanori Ogino 2021-02-25 20:09:41 +09:00 committed by zowoq
parent 77a087facc
commit b51b5a104b
2 changed files with 14 additions and 0 deletions

View file

@ -150,6 +150,13 @@ stdenv.mkDerivation rec {
./skip-nohup-tests.patch
./go_no_vendor_checks-1_14.patch
# support TZ environment variable starting with colon
(fetchpatch {
name = "tz-support-colon.patch";
url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch";
sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f";
})
# fix rare TestDontCacheBrokenHTTP2Conn failure
(fetchpatch {
url = "https://github.com/golang/go/commit/ea1437a8cdf6bb3c2d2447833a5d06dbd75f7ae4.patch";

View file

@ -158,6 +158,13 @@ stdenv.mkDerivation rec {
./skip-nohup-tests.patch
./skip-cgo-tests-1.15.patch
./go_no_vendor_checks.patch
# support TZ environment variable starting with colon
(fetchpatch {
name = "tz-support-colon.patch";
url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch";
sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f";
})
] ++ [
# breaks under load: https://github.com/golang/go/issues/25628
(if stdenv.isAarch32