Merge branch 'master' into staging

2020-07-18 17:50:23 +02:00
parent 5b14758d31 41a323711a
commit 4244b73917
181 changed files with 6696 additions and 6649 deletions
@@ -30,11 +30,11 @@ in

 stdenv.mkDerivation rec {
  pname = "go";
-  version = "1.13.12";
+  version = "1.13.14";

  src = fetchurl {
    url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "0d5s5rqyzp6ykj4x1dz8infcsmj3gy8djnf63ji971ypwi6jrfhp";
+    sha256 = "01mbqzn1hj8idbyn2f9gghvirfnw348dcf7pjs3ymschfblk6wqr";
  };

  # perl is used for testing go vet
@@ -196,8 +196,11 @@ stdenv.mkDerivation rec {

    export PATH=$(pwd)/bin:$PATH

+    ${optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
    # Independent from host/target, CC should produce code for the building system.
+    # We only set it when cross-compiling.
    export CC=${buildPackages.stdenv.cc}/bin/cc
+    ''}
    ulimit -a
  '';

@@ -1,6 +1,6 @@
 import ./generic.nix {
  major_version = "4";
  minor_version = "11";
-  patch_version = "0+beta1";
-  sha256 = "1xhkwprbnd3wp6bi3k74f42l1mff1ngn7gl4rgad9dk4ly0yzfdr";
+  patch_version = "0+beta2";
+  sha256 = "1n39qfwvpwlhp9m73zi9hrk9ny9g6spy9apc36n2ydpf5dn7pg75";
 }