diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix deleted file mode 100644 index ee6d071a84ca..000000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -let self = buildGoPackage rec { - name = "prometheus-pushgateway-${rev}"; - rev = "0.1.1"; - goPackagePath = "github.com/prometheus/pushgateway"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "pushgateway"; - sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; - }; - - buildInputs = [ - protobuf - httprouter - golang_protobuf_extensions - prometheus.client_golang - ]; - - nativeBuildInputs = [ - go-bindata.bin - ]; - - buildFlagsArray = '' - -ldflags= - -X main.buildVersion=${rev} - -X main.buildRev=${rev} - -X main.buildBranch=master - -X main.buildUser=nix@nixpkgs - -X main.buildDate=20150101-00:00:00 - -X main.goVersion=${lib.getVersion go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - go-bindata ./resources/ - ) - ''; - - meta = with lib; { - description = - "Allows ephemeral and batch jobs to expose metrics to Prometheus"; - homepage = https://github.com/prometheus/pushgateway; - 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 11067e8ed35a..2dc120ac50e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9206,9 +9206,8 @@ let prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin; prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin; prometheus-node-exporter = goPackages.prometheus.node-exporter.bin; + prometheus-pushgateway = goPackages.prometheus.pushgateway.bin; - prometheus-pushgateway = - callPackage ../servers/monitoring/prometheus/pushgateway { }; prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd_bridge { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3a70e93db323..6dc6168a2a15 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -2228,6 +2228,46 @@ let }; }; + prometheus.pushgateway = buildFromGitHub rec { + rev = "0.1.1"; + owner = "prometheus"; + repo = "pushgateway"; + sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; + + buildInputs = [ + protobuf + httprouter + golang_protobuf_extensions + prometheus.client_golang + ]; + + nativeBuildInputs = [ go-bindata.bin ]; + preBuild = '' + ( + cd "go/src/$goPackagePath" + go-bindata ./resources/ + ) + ''; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion=${rev} + -X main.buildRev=${rev} + -X main.buildBranch=master + -X main.buildUser=nix@nixpkgs + -X main.buildDate=20150101-00:00:00 + -X main.goVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + homepage = https://github.com/prometheus/pushgateway; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + pty = buildFromGitHub { rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; owner = "kr";