diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-03-10 13:31:05 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-03-10 13:31:16 -0500 |
| commit | 7dff6a8689351069ba3734aad2c90e19b3b835b0 (patch) | |
| tree | f7c61efa3ac712464e1fa3496587af66b672e793 | |
| parent | 2b450377bf6e51cce0d831a88e74d5f61811b74d (diff) | |
| download | nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.tar nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.tar.gz nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.tar.bz2 nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.tar.lz nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.tar.xz nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.tar.zst nixlib-7dff6a8689351069ba3734aad2c90e19b3b835b0.zip | |
kubernetes: fix on Darwin
Also bump its Go version to 1.7, since 1.6 is fatally flawed on macOS 10.12
| -rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 0040d0ca8238..952fd8fe9b6e 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -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 = '' @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = http://kubernetes.io; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e44665766d62..8044b1a39966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |