diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-02-23 15:06:47 -0600 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-03-06 08:47:50 -0500 |
| commit | 8d6fbd05786b1859d7621f636455843aeb314b7b (patch) | |
| tree | a3891b68ce29c1e48747eb5adffd31ec669bcbae /pkgs/top-level | |
| parent | 8ac336b539bd8e79a2c199d42a246330ceddcb96 (diff) | |
go: 1.7 -> 1.8
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 297229b78867..9f59811f5319 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5175,7 +5175,13 @@ with pkgs; stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; }); - go = go_1_7; + go_1_8 = callPackage ../development/compilers/go/1.8.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // stdenv.lib.optionalAttrs stdenv.isDarwin { + stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; + }); + + go = go_1_8; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -10250,7 +10256,11 @@ with pkgs; go = go_1_7; }; - buildGoPackage = buildGo17Package; + buildGo18Package = callPackage ../development/go-modules/generic { + go = go_1_8; + }; + + buildGoPackage = buildGo18Package; go2nix = callPackage ../development/tools/go2nix { }; |