diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/servers/monitoring | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
download | nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2 nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/servers/monitoring')
46 files changed, 48 insertions, 48 deletions
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index c8eb07319245..957bb59b1214 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "bosun-${version}"; + pname = "bosun"; version = "0.5.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 502a3026b2ae..66b848a1975e 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -1,7 +1,7 @@ { stdenv, go, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "cadvisor-${version}"; + pname = "cadvisor"; version = "0.33.1"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index a888549bb6aa..707d0129f70b 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul-alerts-${version}"; + pname = "consul-alerts"; version = "0.5.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix index efa62e261b74..e5f30f4e6146 100644 --- a/pkgs/servers/monitoring/facette/default.nix +++ b/pkgs/servers/monitoring/facette/default.nix @@ -2,7 +2,7 @@ , go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }: stdenv.mkDerivation rec { - name = "facette-${version}"; + pname = "facette"; version = "0.4.1"; src = fetchFromGitHub { owner = "facette"; diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 1004947d5b12..502ff10b0929 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "reporter-${version}"; + pname = "reporter"; version = "2.1.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c9e6da89d93e..570dd0ff20e5 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "6.3.2"; - name = "grafana-${version}"; + pname = "grafana"; goPackagePath = "github.com/grafana/grafana"; excludedPackages = [ "release_publisher" ]; diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index 969a58aff85d..f33a418fe5ce 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "kapacitor-${version}"; + pname = "kapacitor"; version = "1.5.1"; goPackagePath = "github.com/influxdata/kapacitor"; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index af5f2880a0f8..cc67bdfa56db 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -2,7 +2,7 @@ , doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: stdenv.mkDerivation rec { - name = "lcdproc-${version}"; + pname = "lcdproc"; version = "0.5.9"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 223026c3b411..ed37c7f39871 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { version = "0.2.0"; - name = "grafana-loki-${version}"; + pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; doCheck = true; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 45e380379d2f..5459d58ceb9f 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.1.5"; - name = "longview-${version}"; + pname = "longview"; src = fetchFromGitHub { owner = "linode"; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 5044aef2bb53..31a6501ea3a5 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, gotools, buildGoPackage }: buildGoPackage rec { - name = "mtail-${version}"; + pname = "mtail"; version = "3.0.0-rc4"; goPackagePath = "github.com/google/mtail"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 34beada87e82..183cc3a2b955 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.0.49"; - name = "munin-${version}"; + pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 92713a43ea22..475d79a090af 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }: stdenv.mkDerivation rec { - name = "nagios-${version}"; + pname = "nagios"; version = "4.4.4"; src = fetchurl { - url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "0nkbv8lzpiknddiq0466dlpp3hw8lqmaidk8931hp4664cdsaw57"; }; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index cdfd8ab9beeb..35d02a5f9e2c 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }: stdenv.mkDerivation rec { - name = "check_ssl_cert-${version}"; + pname = "check_ssl_cert"; version = "1.80.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 401f9ffc4066..2dc1bdf9681c 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "newrelic-sysmond-${version}"; + pname = "newrelic-sysmond"; version = "2.3.0.132"; src = fetchurl { diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 9f03c9ea96f6..79303849156a 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "check-uptime-${version}"; + pname = "check-uptime"; version = "20161112"; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index e104f31a74de..95e2822d65ba 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "alertmanager-${version}"; + pname = "alertmanager"; version = "0.16.2"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index db58c7e14e5f..07c8a14ce0b3 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "bind_exporter-${version}"; + pname = "bind_exporter"; version = "20161221-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba"; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index 9803ba09e16a..970f49713a3b 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "blackbox_exporter-${version}"; + pname = "blackbox_exporter"; version = "0.14.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index 0d6fbac60e5d..ce4bacfc9b7c 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "collectd-exporter-${version}"; + pname = "collectd-exporter"; version = "0.3.1"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 47abcb33ee79..aaee2e8d770d 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "consul_exporter-${version}"; + pname = "consul_exporter"; version = "0.3.0"; goPackagePath = "github.com/prometheus/consul_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index e43488bbaaeb..b01fa0024de5 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dnsmasq_exporter-${version}"; + pname = "dnsmasq_exporter"; version = "0.1.0"; goPackagePath = "github.com/google/dnsmasq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix index 5a3fd23ec22e..6f6370ce14df 100644 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "dovecot_exporter-${version}"; + pname = "dovecot_exporter"; version = "0.1.3"; goPackagePath = "github.com/kumina/dovecot_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 071035b2a4ac..95b0db7dbc60 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "fritzbox-exporter-${version}"; + pname = "fritzbox-exporter"; version = "v1.0-32-g90fc0c5"; rev = "90fc0c572d3340803f7c2aafc4b097db7af1f871"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index b2a0e3875891..4a84db38f78d 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "haproxy_exporter-${version}"; + pname = "haproxy_exporter"; version = "0.8.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index aeb7b7445a5d..f126b8a7da1c 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -2,7 +2,7 @@ { buildGoPackage, fetchFromGitHub, fetchpatch, lib }: buildGoPackage rec { - name = "prometheus-json-exporter-${version}"; + pname = "prometheus-json-exporter"; version = "unstable-2017-10-06"; goPackagePath = "github.com/kawamuray/prometheus-json-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 129c2b333723..21c6c8da6439 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mailexporter-${version}"; + pname = "mailexporter"; version = "2019-07-14"; goPackagePath = "github.com/cherti/mailexporter"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ade9bb87d993..04fbc7fbed93 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mesos_exporter-${version}"; + pname = "mesos_exporter"; version = "0.1.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 8b6c54d41f91..7d4607738027 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { - name = "minio-exporter-${version}"; + pname = "minio-exporter"; version = "0.2.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 9180a5113492..a7934227ffab 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mysqld_exporter-${version}"; + pname = "mysqld_exporter"; version = "0.10.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 963315f00c12..c51574610e87 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "nginx_exporter-${version}"; + pname = "nginx_exporter"; version = "0.4.2"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 80ad4a32be75..d0f55226d2ff 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "node_exporter-${version}"; + pname = "node_exporter"; version = "0.17.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index eac962f75606..5dfada4f55d7 100644 --- a/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "openvpn_exporter-unstable-${version}"; + pname = "openvpn_exporter-unstable"; version = "2017-05-15"; rev = "a2a179a222144fa9a10030367045f075375a2803"; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 97df26aea4e5..01d9ec028338 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -4,7 +4,7 @@ with stdenv.lib; buildGoPackage rec { - name = "postfix_exporter-${version}"; + pname = "postfix_exporter"; version = "0.1.2"; goPackagePath = "github.com/kumina/postfix_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index ffa71f3ad0c1..57574481cf68 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildGoPackage rec { - name = "postgres_exporter-${version}"; + pname = "postgres_exporter"; version = "0.5.1"; goPackagePath = "github.com/wrouesnel/postgres_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 5e4ebb581400..efe146c843fb 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "prom2json-${version}"; + pname = "prom2json"; version = "0.1.0"; rev = "${version}"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 1c00f734c19e..48afc610c615 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,7 +1,7 @@ { stdenv, go, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "pushgateway-${version}"; + pname = "pushgateway"; version = "0.8.0"; rev = "v${version}"; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 34120ad3fdae..331503dfe7d4 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -2,7 +2,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "rabbitmq_exporter-${version}"; + pname = "rabbitmq_exporter"; version = "0.25.2"; goPackagePath = "github.com/kbudde/rabbitmq_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index be8fbd3d85cb..cbafabb18b52 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, net_snmp }: buildGoPackage rec { - name = "snmp_exporter-${version}"; + pname = "snmp_exporter"; version = "0.13.0"; goPackagePath = "github.com/prometheus/snmp_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 792e0b33aee1..f4aa8344f777 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "statsd_exporter-${version}"; + pname = "statsd_exporter"; version = "0.9.0"; rev = version; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 0c5cc6267659..07b5055831e7 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "surfboard_exporter-${version}"; + pname = "surfboard_exporter"; version = "2.0.0"; goPackagePath = "github.com/ipstatic/surfboard_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 18fa3f98db23..cd72f98ecfba 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "unifi-exporter-${version}"; + pname = "unifi-exporter"; version = "0.4.0+git1"; rev = "9a4e69fdea91dd0033bda4842998d751b40a6130"; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 50325144fcac..9de6e6923e36 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "riemann-${version}"; + pname = "riemann"; version = "0.3.3"; src = fetchurl { - url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; + url = "https://github.com/riemann/riemann/releases/download/${version}/${pname}-${version}.tar.bz2"; sha256 = "11xcmmp5k78vr5ch42zwx9ym84y6kf81z9zwawqybvx7wmlbpdiq"; }; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index ab8365c23f81..eb98e45c36c3 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "seyren-${version}"; + pname = "seyren"; version = "1.1.0"; src = fetchurl { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ee3b9d818ce1..dfe2bdb71b28 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "telegraf-${version}"; + pname = "telegraf"; version = "1.10.2"; goPackagePath = "github.com/influxdata/telegraf"; diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index 4c3479d8662e..fe90d4d6408b 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, makeWrapper, jre}: stdenv.mkDerivation rec { version = "1.28.1"; - name = "zipkin-server-${version}"; + pname = "zipkin-server"; src = fetchurl { url = "https://search.maven.org/remotecontent?filepath=io/zipkin/java/zipkin-server/${version}/zipkin-server-${version}-exec.jar"; sha256 = "02369fkv0kbl1isq6y26fh2zj5wxv3zck522m5wypsjlcfcw2apa"; |