diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/applications/networking/cluster | |
parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
download | nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip |
Merge staging into closure-size
Diffstat (limited to 'pkgs/applications/networking/cluster')
-rw-r--r-- | pkgs/applications/networking/cluster/kubernetes/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/networking/cluster/marathon/default.nix | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index c89ad0a5168..fbfe4de23b8 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,25 +2,27 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.12.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml"; + sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; }; buildInputs = [ makeWrapper which go iptables rsync ]; - preBuild = "patchShebangs ./hack"; - - postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go''; + buildPhase = '' + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" + GOPATH=$(pwd) + patchShebangs ./hack + hack/build-go.sh --use_go_build + ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" - cp pause $out/bin/kube-pause ''; preFixup = '' @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Open source implementation of container cluster management."; + description = "Open source implementation of container cluster management"; license = licenses.asl20; homepage = https://github.com/GoogleCloudPlatform; maintainers = with maintainers; [offline]; diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index 36ce79aaf34..1714aa274f0 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://mesosphere.github.io/marathon; - description = "Cluster-wide init and control system for services in cgroups or Docker containers."; + description = "Cluster-wide init and control system for services in cgroups or Docker containers"; license = licenses.asl20; maintainers = with maintainers; [ rushmorem ]; platforms = platforms.linux; |