Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-28 06:18:00 +00:00
committed by GitHub
9 changed files with 208 additions and 8 deletions
+7
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";
+7
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