about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2016-02-20 20:41:44 -0500
committerCharles Strahan <charles.c.strahan@gmail.com>2016-02-20 20:41:44 -0500
commiteb905c2d7611f493e68c0fa6a714404e5f8b7b5a (patch)
tree8957522d5c623da7abbff7720807ea48eb70e7a8 /pkgs/top-level
parent123a9104e48bebf30eddfc883677e8163412ae3b (diff)
parent673bc7f32aaf40c6c83900b9ce883d345c668318 (diff)
downloadnixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.tar
nixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.tar.gz
nixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.tar.bz2
nixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.tar.lz
nixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.tar.xz
nixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.tar.zst
nixlib-eb905c2d7611f493e68c0fa6a714404e5f8b7b5a.zip
Merge pull request #13084 from nathan7/go-1.6
go: add 1.6 compiler and packages
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix13
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d395e08e1af..34d9362a60e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4303,6 +4303,10 @@ let
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   };
 
+  go_1_6 = callPackage ../development/compilers/go/1.6.nix {
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  };
+
   go = go_1_5;
 
   go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
@@ -9134,6 +9138,15 @@ let
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
 
+  go16Packages = callPackage ./go-packages.nix {
+    go = go_1_6;
+    buildGoPackage = callPackage ../development/go-modules/generic {
+      go = go_1_6;
+      govers = go16Packages.govers.bin;
+    };
+    overrides = (config.goPackageOverrides or (p: {})) pkgs;
+  };
+
   goPackages = go15Packages;
 
   ### DEVELOPMENT / LISP MODULES