diff options
author | Benjamin Staffin <benley@gmail.com> | 2015-08-29 14:21:31 -0700 |
---|---|---|
committer | Benjamin Staffin <benley@gmail.com> | 2015-08-29 22:13:51 -0700 |
commit | a480bd89dce1103b00689edd9e2a9907fc701281 (patch) | |
tree | c0de3b98fa1e7fcf9e3bfc7755b989fcb026760e /pkgs/servers | |
parent | 96882b14d5e400dbca8c0b3c1735e4e7579f1606 (diff) | |
download | nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.tar nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.tar.gz nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.tar.bz2 nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.tar.lz nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.tar.xz nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.tar.zst nixlib-a480bd89dce1103b00689edd9e2a9907fc701281.zip |
prometheus-*: fixes to deal with goPackages multiple-outputs changes
Diffstat (limited to 'pkgs/servers')
11 files changed, 46 insertions, 24 deletions
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix index f2f5eaa6f183..30c728e63cae 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-alertmanager-${rev}"; rev = "0.0.4"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -13,7 +13,7 @@ goPackages.buildGoPackage rec { }; buildInputs = [ - goPackages.protobuf + goPackages.protobuf.bin goPackages.fsnotify.v0 goPackages.httprouter goPackages.prometheus.client_golang @@ -51,4 +51,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix index 701ee46d4981..924e20b528cd 100644 --- a/pkgs/servers/monitoring/prometheus/cli/default.nix +++ b/pkgs/servers/monitoring/prometheus/cli/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, goPackages, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-cli-${rev}"; rev = "0.3.0"; goPackagePath = "github.com/prometheus/prometheus_cli"; @@ -24,4 +24,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix index a859c4377015..dff02d3cc921 100644 --- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix @@ -1,6 +1,6 @@ { goPackages, lib, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-collectd-exporter-${rev}"; rev = "0.1.0"; goPackagePath = "github.com/prometheus/collectd_exporter"; @@ -21,4 +21,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix index 63c421cd8a28..9ff421aa212f 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, goPackages, fetchFromGitHub, }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-haproxy-exporter-0.4.0"; goPackagePath = "github.com/prometheus/haproxy_exporter"; @@ -20,4 +20,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix index fec66af2469a..1fd9224e17ff 100644 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, goPackages, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-mesos-exporter-${rev}"; rev = "0.1.0"; goPackagePath = "github.com/prometheus/mesos_exporter"; @@ -25,4 +25,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix index 0b399d0cfff5..127dc752e149 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix @@ -1,6 +1,6 @@ { goPackages, lib, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-mysqld-exporter-${rev}"; rev = "0.1.0"; goPackagePath = "github.com/prometheus/mysqld_exporter"; @@ -24,4 +24,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix index b45b2784042e..b716bdd17227 100644 --- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix @@ -1,6 +1,6 @@ { lib, goPackages, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-nginx-exporter-${version}"; version = "git-2015-06-01"; goPackagePath = "github.com/discordianfish/nginx_exporter"; @@ -24,4 +24,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix index 922c958b3f52..8635228a612c 100644 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix @@ -2,7 +2,7 @@ with goPackages; -buildGoPackage rec { +let self = buildGoPackage rec { name = "prometheus-node-exporter-${rev}"; rev = "0.10.0"; goPackagePath = "github.com/prometheus/node_exporter"; @@ -30,4 +30,6 @@ buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix index 368ea3ae214f..716f3c8bf545 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json/default.nix @@ -1,6 +1,6 @@ { goPackages, lib, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prom2json-${rev}"; rev = "0.1.0"; goPackagePath = "github.com/prometheus/prom2json"; @@ -25,4 +25,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix index ae1e1e38902f..1b0fcd7485e2 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix @@ -2,7 +2,7 @@ with goPackages; -buildGoPackage rec { +let self = buildGoPackage rec { name = "prometheus-pushgateway-${rev}"; rev = "0.1.1"; goPackagePath = "github.com/prometheus/pushgateway"; @@ -15,7 +15,7 @@ buildGoPackage rec { }; buildInputs = [ - go-bindata + go-bindata.bin protobuf httprouter golang_protobuf_extensions @@ -47,4 +47,6 @@ buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix index 31acf79c8139..52672edcdb61 100644 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, goPackages, fetchFromGitHub }: -goPackages.buildGoPackage rec { +let self = goPackages.buildGoPackage rec { name = "prometheus-statsd-bridge-${version}"; version = "0.1.0"; goPackagePath = "github.com/prometheus/statsd_bridge"; @@ -24,4 +24,6 @@ goPackages.buildGoPackage rec { maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; -} +}; + +in self.bin |