diff options
Diffstat (limited to 'pkgs/servers/monitoring')
16 files changed, 20 insertions, 59 deletions
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 77271b26a8de6..5b5593d551420 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, goPackages }: +{ lib, fetchFromGitHub, buildGoPackage }: -goPackages.buildGoPackage rec { +buildGoPackage rec { name = "bosun"; rev = "0.5.0-alpha"; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 98cb3a3db48c8..ee904dec6eba0 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,9 +1,6 @@ -# This file was generated by go2nix. -{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }: -with go16Packages; - -buildGoPackage rec { +buildGo16Package rec { name = "consul-alerts-${version}"; version = "0.3.3"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 55ef139624c4b..28bf83a247fc2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,6 +1,6 @@ -{ lib, goPackages, fetchurl, fetchFromGitHub }: +{ lib, buildGoPackage, fetchurl, fetchFromGitHub }: -goPackages.buildGoPackage rec { +buildGoPackage rec { version = "3.0.1"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix index f50a52fe2804c..db3c518c72963 100644 --- a/pkgs/servers/monitoring/heapster/default.nix +++ b/pkgs/servers/monitoring/heapster/default.nix @@ -1,6 +1,6 @@ -{ lib, goPackages, fetchFromGitHub, docker }: +{ lib, buildGoPackage, fetchFromGitHub, docker }: -goPackages.buildGoPackage rec { +buildGoPackage rec { rev = "3057a2c07061c8d9ffaf77e5442ffd7512ac0133"; name = "heapster-${lib.strings.substring 0 7 rev}"; goPackagePath = "k8s.io/heapster"; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 2bed947aad00e..846d1d57277d7 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "alertmanager-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix index 5dd7c207f104b..20f6e7249abf2 100644 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ b/pkgs/servers/monitoring/prometheus/cli.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "prometheus_cli-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 3b22fedfd930e..49701505aa614 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "collectd-exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index d6b82c38d01e0..aa76fdc455ae2 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "prometheus-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index efb5abd9f9f7a..140bde2c0cbf1 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "haproxy_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index a06c9671f8177..0fdff08ca1da9 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "mesos_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 29bf6bdb3bb28..d0c1c2073f5be 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "mysqld_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 5da457c0a190d..c3b25e2fcc56f 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "nginx_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 276ff73d0fcc9..3b8d6fe166644 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "node_exporter-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 512cd4ca22cab..5f45c63d96e63 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "prom2json-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 751748783e47a..83ef4e2093116 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, go, buildGoPackage, go-bindata, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "pushgateway-${version}"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index 4458b668a197e..90a35bf4592df 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "statsd_bridge-${version}"; |