diff options
| author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2017-10-26 10:08:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 10:08:19 -0400 |
| commit | a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901 (patch) | |
| tree | 92f6af89ce66ae7ccb61af45171161dafcee8fb9 /pkgs/development | |
| parent | beb4f227ce83edf30f2056653e4dda2f07042d20 (diff) | |
| parent | df04f0cb63f8df815ec95d284317373a14876b61 (diff) | |
| download | nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.tar nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.tar.gz nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.tar.bz2 nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.tar.lz nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.tar.xz nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.tar.zst nixlib-a1f7aa1ceb313c7a54cb81de76955ce6c6b8c901.zip | |
Merge pull request #30820 from adisbladis/go_1_9_2
Go: 1.9.1 -> 1.9.2 && Go: 1.8.4 -> 1.8.5
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/go/1.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 838032c96984..538c20bac72a 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -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 diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index a90985c2525a..50fa2d976273 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -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 '' |