Merge pull request #9370 from offlinehacker/pkgs/kubernetes/fixbuild

kubernetes: fix build
This commit is contained in:
Jaka Hudoklin 2015-08-20 20:25:32 +02:00
commit ca86b52590

View File

@ -1521,7 +1521,7 @@ let
lp_solve = callPackage ../applications/science/math/lp_solve { };
lprof = callPackage ../tools/graphics/lprof { };
fatresize = callPackage ../tools/filesystems/fatresize {};
fdk_aac = callPackage ../development/libraries/fdk-aac { };
@ -11903,7 +11903,9 @@ let
ksuperkey = callPackage ../tools/X11/ksuperkey { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes { };
kubernetes = callPackage ../applications/networking/cluster/kubernetes {
go = go_1_4;
};
lame = callPackage ../development/libraries/lame { };