Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-11-22 09:57:08 +01:00
122 changed files with 2802 additions and 902 deletions

View File

@@ -174,7 +174,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; {
branch = "1.9";
branch = "1.10";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;

View File

@@ -184,7 +184,7 @@ stdenv.mkDerivation rec {
disallowedReferences = [ go_bootstrap ];
meta = with stdenv.lib; {
branch = "1.9";
branch = "1.11";
homepage = http://golang.org/;
description = "The Go Programming language";
license = licenses.bsd3;