git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #145166: kuma-*: init at 1.4.0 (missing components)
commit5e154b5c8030956682c3b41335edb4ff4a5e4a24 authorVladimír Čunát <v@cunat.cz> dateTue 30 Nov 2021, 09:09 (5 years ago) parented8b110c60adb9
3 files changed+87−35
pkgs/applications/networking/cluster/kuma/default.nix+65 pkgs/applications/networking/cluster/kumactl/default.nix−34 pkgs/top-level/all-packages.nix+22−1
pkgs/applications/networking/cluster/kuma/default.nixnew file+65
@@ -0,0 +1,65 @@
1+{ lib
2+, fetchFromGitHub
3+, buildGoModule
4+, coredns
5+, installShellFiles
6+, isFull ? false
7+, enableGateway ? false
8+, pname ? "kuma"
9+, components ? lib.optionals isFull [
10+ "kumactl"
11+ "kuma-cp"
12+ "kuma-prometheus-sd"
13+ "kuma-dp"
14+ ]
15+}:
16+
17+buildGoModule rec {
18+ inherit pname ;
19+ version = "1.4.0";
20+ tags = lib.optionals enableGateway ["gateway"];
21+ vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl";
22+
23+ src = fetchFromGitHub {
24+ owner = "kumahq";
25+ repo = "kuma";
26+ rev = version;
27+ sha256 = "0agib3w5s270n5rhg54m3p4f21s5fhdrhaks374j7l21njs7xhqb";
28+ };
29+
30+ doCheck = false;
31+
32+ nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns];
33+
34+ preBuild = ''
35+ export HOME=$TMPDIR
36+ '';
37+
38+ subPackages = map (p: "app/" + p) components;
39+
40+ postInstall = lib.concatMapStringsSep "\n" (p: ''
41+ installShellCompletion --cmd ${p} \
42+ --bash <($out/bin/${p} completion bash) \
43+ --fish <($out/bin/${p} completion fish) \
44+ --zsh <($out/bin/${p} completion zsh)
45+ '') components + lib.optionalString isFull ''
46+ ln -sLf ${coredns}/bin/coredns $out/bin
47+ '';
48+
49+ ldflags = let
50+ prefix = "github.com/kumahq/kuma/pkg/version";
51+ in [
52+ "-s" "-w"
53+ "-X ${prefix}.version=${version}"
54+ "-X ${prefix}.gitTag=${version}"
55+ "-X ${prefix}.gitCommit=${version}"
56+ "-X ${prefix}.buildDate=${version}"
57+ ];
58+
59+ meta = with lib; {
60+ description = "Service mesh controller";
61+ homepage = "https://kuma.io/";
62+ license = licenses.asl20;
63+ maintainers = with maintainers; [ zbioe ];
64+ };
65+}
pkgs/applications/networking/cluster/kumactl/default.nixdeleted−34
@@ -1,34 +0,0 @@
1−{ lib, fetchFromGitHub, buildGoModule }:
2−
3−buildGoModule rec {
4− pname = "kumactl";
5− version = "1.3.1";
6−
7− src = fetchFromGitHub {
8− owner = "kumahq";
9− repo = "kuma";
10− rev = version;
11− sha256 = "0b554cngg2j3wnadpqwhq3dv3la8vvvzyww2diw4il4gl4j6xj0j";
12− };
13−
14− vendorSha256 = "0r26h4vp11wbl7nk3y7c22p60q7lspy8nr58khxyczdqjk6wrdjp";
15−
16− subPackages = [ "app/kumactl" ];
17−
18− ldflags = let
19− prefix = "github.com/kumahq/kuma/pkg/version";
20− in [
21− "-s" "-w"
22− "-X ${prefix}.version=${version}"
23− "-X ${prefix}.gitTag=${version}"
24− "-X ${prefix}.gitCommit=${version}"
25− "-X ${prefix}.buildDate=${version}"
26− ];
27−
28− meta = with lib; {
29− description = "Kuma service mesh controller";
30− homepage = "https://kuma.io/";
31− license = licenses.asl20;
32− maintainers = with maintainers; [ zbioe ];
33− };
34−}
pkgs/top-level/all-packages.nix+22−1
@@ -26411,7 +26411,28 @@ with pkgs;
2641126411 linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { };
2641226412 linkerd_stable = linkerd;
2641326413
26414− kumactl = callPackage ../applications/networking/cluster/kumactl { };
26414+ kuma = callPackage ../applications/networking/cluster/kuma { isFull = true; };
26415+ kuma-experimental = callPackage ../applications/networking/cluster/kuma {
26416+ isFull = true;
26417+ enableGateway = true;
26418+ pname = "kuma-experimental";
26419+ };
26420+ kumactl = callPackage ../applications/networking/cluster/kuma {
26421+ components = ["kumactl"];
26422+ pname = "kumactl";
26423+ };
26424+ kuma-cp = callPackage ../applications/networking/cluster/kuma {
26425+ components = ["kuma-cp"];
26426+ pname = "kuma-cp";
26427+ };
26428+ kuma-dp = callPackage ../applications/networking/cluster/kuma {
26429+ components = ["kuma-dp"];
26430+ pname = "kuma-dp";
26431+ };
26432+ kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma {
26433+ components = ["kuma-prometheus-sd"];
26434+ pname = "kuma-prometheus-sd";
26435+ };
2641526436
2641626437 kile-wl = callPackage ../applications/misc/kile-wl { };
2641726438