@@ -1,4 +1,4 @@
1−{ buildGo117Module
1+{ buildGoModule
22, fetchFromGitHub
33, fetchurl
44, go-bindata
@@ -15,7 +15,6 @@ let
1515 version = "2.1.1";
1616 ui_version = "2.1.2";
1717 libflux_version = "0.139.0";
18− cli_version = "2.2.1";
1918
2019 src = fetchFromGitHub {
2120 owner = "influxdata";
@@ -61,21 +60,7 @@ let
6160 '';
6261 };
6362
64− cli = buildGo117Module {
65− pname = "influxdb-cli";
66− version = version;
67− src = fetchFromGitHub {
68− owner = "influxdata";
69− repo = "influx-cli";
70− rev = "v${cli_version}";
71− sha256 = "sha256-9FUchI93xLpQwtpbr5S3GfVrApHaemwbnRPIfAWmG6Y=";
72− };
73−
74− vendorSha256 = "sha256-Boz1G8g0fjjlflxZh4V8sd/v0bE9Oy3DpqywOpKxjd0=";
75− subPackages = [ "cmd/influx" ];
76− ldflags = [ "-X main.commit=v${cli_version}" "-X main.version=${cli_version}" ];
77− };
78−in buildGo117Module {
63+in buildGoModule {
7964 pname = "influxdb";
8065 version = version;
8166 src = src;
@@ -83,7 +68,7 @@ in buildGo117Module {
8368 nativeBuildInputs = [ go-bindata pkg-config ];
8469
8570 vendorSha256 = "sha256-GVLAzVJzSsC10ZWDZPP8upydwZG21E+zQ6sMKm1lCY0=";
86− subPackages = [ "cmd/influxd" ];
71+ subPackages = [ "cmd/influxd" "cmd/telemetryd" ];
8772
8873 PKG_CONFIG_PATH = "${flux}/pkgconfig";
8974 # Check that libflux and the UI are at the right version, and embed
@@ -109,9 +94,6 @@ in buildGo117Module {
10994 go generate
11095 popd
11196 '';
112− postInstall = ''
113− ln -s ${cli}/bin/influx $out/bin/influx
114− '';
11597
11698 tags = [ "assets" ];
11799
@@ -121,6 +103,6 @@ in buildGo117Module {
121103 description = "An open-source distributed time series database";
122104 license = licenses.mit;
123105 homepage = "https://influxdata.com/";
124− maintainers = with maintainers; [ danderson ];
106+ maintainers = with maintainers; [ abbradar danderson ];
125107 };
126108}