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: d7f1e21fd934
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a5bfda3f433
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 9, 2019

  1. go: apply upstream patch 

    This should fix the tests almost always failing on Hydra for i686.

(cherry picked from commit d8218de)
/cc ZHF #68361.
    @vcunat
    vcunat committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    snyk-bot Snyk bot
    GPG key ID: 78AC5AE55A47A65B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2a5bfda View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/development/compilers/go/1.12.nix
7 changes: 6 additions & 1 deletion 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, tzdata, iana-etc, runCommand
{ stdenv, fetchurl, fetchpatch, tzdata, iana-etc, runCommand
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages, pkgsTargetTarget
@@ -137,6 +137,11 @@ 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 = ''