Skip to content

Commit

Permalink
kubernetes: fix on Darwin
Browse files Browse the repository at this point in the history
Also bump its Go version to 1.7, since 1.6 is fatally flawed on macOS 10.12
  • Loading branch information
copumpkin committed Mar 10, 2017
1 parent 2b45037 commit 7dff6a8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkgs/applications/networking/cluster/kubernetes/default.nix
Expand Up @@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

postBuild = ''
./hack/generate-docs.sh
(cd build/pause && gcc pause.c -o pause)
(cd build/pause && cc pause.c -o pause)
'';

installPhase = ''
Expand All @@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
homepage = http://kubernetes.io;
maintainers = with maintainers; [offline];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -14188,7 +14188,7 @@ with pkgs;
ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };

kubernetes = callPackage ../applications/networking/cluster/kubernetes {
go = go_1_6;
go = go_1_7;
};

lame = callPackage ../development/libraries/lame { };
Expand Down

2 comments on commit 7dff6a8

@copumpkin
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @offlinehacker just in case there was a reason you'd locked it to 1.6. I was too scared of 1.8 to try that yet 😄

@offlinehacker
Copy link
Contributor

@offlinehacker offlinehacker commented on 7dff6a8 Mar 10, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.