diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-12 10:33:41 +0200 |
| commit | 00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch) | |
| tree | a2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/servers/monitoring | |
| parent | 580cab57e4f188d25144e398d7b8e3d5085299a9 (diff) | |
| parent | bb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff) | |
| download | nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2 nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/node-exporter.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/uchiwa/default.nix | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 02a6197d3846..bb86e59e4c33 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,6 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGo19Package, fetchFromGitHub }: -buildGoPackage rec { +# Go 1.10 causes segfaults: +# https://github.com/prometheus/node_exporter/issues/870 +buildGo19Package rec { name = "node_exporter-${version}"; version = "0.16.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index e7cf3e8f70e4..1de1edfa8e11 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -15,6 +15,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' + mkdir $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; |