Merge pull request #30820 from adisbladis/go_1_9_2

Go: 1.9.1 -> 1.9.2 && Go: 1.8.4 -> 1.8.5
This commit is contained in:
Tim Steinbach 2017-10-26 10:08:19 -04:00 committed by GitHub
commit a1f7aa1ceb
2 changed files with 4 additions and 8 deletions

View File

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.8.4";
version = "1.8.5";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "0p0m63y39pja3fkj43sdq0qv8kqljkz7d58bf9jbw0rjw2c9ml4a";
sha256 = "1ab021l3v29ciaxp738cjpbkh1chlsl6928672q3i82anmdzn5m5";
};
# perl is used for testing go vet

View File

@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "1p226lgsmiwgcvmiakac9i08304cq5ick23vmsk1vjcsh6dvz9i3";
sha256 = "07p4ld07r2nml2bsbfb8h51hqilbqyhhdlia99y1gk7ibvhybv8i";
};
# perl is used for testing go vet
@ -123,10 +123,6 @@ stdenv.mkDerivation rec {
url = "https://github.com/golang/go/commit/29415eb2b92e78481897c4161ba99f5b09fa6102.patch";
sha256 = "01jkm4b2dazzjnfla7rdd0w2clzplga3zza6ybpmkjkk3i4bp73d";
})
(fetchpatch {
url = "https://github.com/golang/go/commit/27e80f7c4d8001598367e15a1617fa524bd0fb11.patch";
sha256 = "1250nrc79jwcagkjqffn5srn78isykvjhvmqhwipwyqb99q85wcz";
})
];
postPatch = optionalString stdenv.isDarwin ''