diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/etcd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/etcd/deps.nix | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 76b29b13c000..547338a11ae8 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,22 +2,25 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "v0.5.2"; + version = "v0.5.4"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = version; - sha256 = "0nrm59v43jx0cskpd294q946053cfw3y2cgs53ji35dnhgj6fl6w"; + sha256 = "1pipcqpjz9zsi4kfsbdvbbbia642l4xg50pznjw5v061c5xk7vnk"; }; buildInputs = [ makeWrapper which go iptables rsync ]; preBuild = "patchShebangs ./hack"; + postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" + cp pause $out/bin/kube-pause ''; preFixup = '' diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index c3307b249cd3..ea91993e7231 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.5.0-alpha.3"; + version = "0.5.0-alpha.4"; name = "etcd-${version}"; src = import ./deps.nix { diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix index 5516c1e79d1b..1cd8309ad5d0 100644 --- a/pkgs/servers/etcd/deps.nix +++ b/pkgs/servers/etcd/deps.nix @@ -8,8 +8,8 @@ let src = fetchFromGitHub { owner = "coreos"; repo = "etcd"; - rev = "a817ca705b5a06b3d8c008e1a59f08895971cb1e"; - sha256 = "1lksjrb7anh6z8ajnp8jpfz9mxmvm762acdczvc6h1h4997dz982"; + rev = "d01d6119e54f729f54e9776ad5729277fcf38668"; + sha256 = "0h9d6rc8yx7vyv2ggvzsddyng03pjhyb7avm9wrc805qr7p8nhns"; }; } ]; |