diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix deleted file mode 100644 index f4dea0b7580c..000000000000 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -let self = goPackages.buildGoPackage rec { - name = "prometheus-statsd-bridge-${version}"; - version = "0.1.0"; - goPackagePath = "github.com/prometheus/statsd_bridge"; - - src = fetchFromGitHub { - rev = version; - owner = "prometheus"; - repo = "statsd_bridge"; - sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; - }; - - buildInputs = with goPackages; [ - fsnotify.v0 - prometheus.client_golang - ]; - - meta = with lib; { - description = "Receives StatsD-style metrics and exports them to Prometheus"; - homepage = https://github.com/prometheus/statsd_bridge; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -}; - -in self.bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dc120ac50e8..4b138b84e6a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9207,9 +9207,7 @@ let prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin; prometheus-node-exporter = goPackages.prometheus.node-exporter.bin; prometheus-pushgateway = goPackages.prometheus.pushgateway.bin; - - prometheus-statsd-bridge = - callPackage ../servers/monitoring/prometheus/statsd_bridge { }; + prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 6dc6168a2a15..4c71c632a079 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2268,6 +2268,21 @@ let }; }; + prometheus.statsd-bridge = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "statsd_bridge"; + sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; + buildInputs = [ fsnotify.v0 prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Receives StatsD-style metrics and exports them to Prometheus"; + homepage = https://github.com/prometheus/statsd_bridge; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + pty = buildFromGitHub { rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; owner = "kr";