diff options
| author | Masanori Ogino <167209+omasanori@users.noreply.github.com> | 2021-02-25 20:09:41 +0900 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-02-28 14:31:31 +1000 |
| commit | b51b5a104b719721cabf0c7018da82e02014cbbd (patch) | |
| tree | 4dc48ffd98c155fb3acce3745494934107b85e45 | |
| parent | 77a087facc6cbaaa4676e849ccbeb6dbba9d4460 (diff) | |
| download | nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.tar nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.tar.gz nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.tar.bz2 nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.tar.lz nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.tar.xz nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.tar.zst nixpkgs-b51b5a104b719721cabf0c7018da82e02014cbbd.zip | |
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>
| -rw-r--r-- | pkgs/development/compilers/go/1.14.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.15.nix | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 3060e6d4e56..92c1cbdfc18 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -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"; diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 13263104056..4432b1fe895 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -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 |