Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 026f99c119b0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12c10e256ad1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 16, 2019

  1. go_1_12: disable flakey TestGcSys test (PR #70368) 

    In our tests we have experienced failures of this test,
but it was otherwise not reproducible so far. A backported
upstream fix did not alleviate the issue either, so disabling
seems workable for now.

(cherry picked from commit cffba01)
    @d-goldin @vcunat
    d-goldin authored and vcunat committed Oct 16, 2019
    Copy the full SHA
    70eebec View commit details

  2. Revert "go: apply upstream patch" 

    This reverts commit d8218de.
It makes no sense after the parent commit.

(cherry picked from commit 610afbc)
    @vcunat
    vcunat committed Oct 16, 2019
    Copy the full SHA
    12c10e2 View commit details
Showing with 7 additions and 6 deletions.
  1. +7 −6 pkgs/development/compilers/go/1.12.nix
13 changes: 7 additions & 6 deletions pkgs/development/compilers/go/1.12.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, tzdata, iana-etc, runCommand
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages, pkgsTargetTarget
@@ -96,6 +96,12 @@ stdenv.mkDerivation rec {
# Disable cgo lookup tests not works, they depend on resolver
rm src/net/cgo_unix_test.go
# Disable TestGcSys because it's flakey in our tests, but the failure is not
# reproducible by multiple people in other environments.
# See https://github.com/NixOS/nixpkgs/issues/68361#issuecomment-537849272 and following
# NOTE: Try re-enabling for releases newer than 1.12.9
sed -i '/TestGcSys/areturn' src/runtime/gc_test.go
'' + optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
'' + optionalString stdenv.isAarch32 ''
@@ -137,11 +143,6 @@ stdenv.mkDerivation rec {
./skip-nohup-tests.patch
# breaks under load: https://github.com/golang/go/issues/25628
./skip-test-extra-files-on-386.patch
(fetchpatch { # probably included in >= 1.12.10
url = "https://github.com/golang/go/commit/aae0b5b0b.diff";
name = "TestGcSys-too-much-memory.diff";
sha256 = "1bl9d2pl6n99n9g65cq91sygmp1iva5rmrxbprwn4xd0ql36psa8";
})
];

postPatch = ''