From 96882b14d5e400dbca8c0b3c1735e4e7579f1606 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 14:16:51 -0700
Subject: [PATCH 01/17] prometheus: Include console templates and libraries

Also tweaked to work with the recent goPackages multiple-outputs stuff.
---
 pkgs/servers/monitoring/prometheus/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index c6ed75e0d09..bdf87e279ba 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, goPackages, fetchFromGitHub, vim }:
 
-goPackages.buildGoPackage rec {
+let self = goPackages.buildGoPackage rec {
   name = "prometheus-${version}";
   version = "0.15.1";
   goPackagePath = "github.com/prometheus/prometheus";
@@ -27,6 +27,12 @@ goPackages.buildGoPackage rec {
     yaml-v2
   ];
 
+  preInstall = ''
+    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+    cp -a $src/documentation/* $bin/share/doc/prometheus
+    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+  '';
+
   # Metadata that gets embedded into the binary
   buildFlagsArray = let t = "${goPackagePath}/version"; in
   ''
@@ -46,4 +52,6 @@ goPackages.buildGoPackage rec {
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
-}
+};
+
+in self.bin

From a480bd89dce1103b00689edd9e2a9907fc701281 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 14:21:31 -0700
Subject: [PATCH 02/17] prometheus-*: fixes to deal with goPackages
 multiple-outputs changes

---
 .../monitoring/prometheus/alertmanager/default.nix        | 8 +++++---
 pkgs/servers/monitoring/prometheus/cli/default.nix        | 6 ++++--
 .../monitoring/prometheus/collectd_exporter/default.nix   | 6 ++++--
 .../monitoring/prometheus/haproxy_exporter/default.nix    | 6 ++++--
 .../monitoring/prometheus/mesos_exporter/default.nix      | 6 ++++--
 .../monitoring/prometheus/mysqld_exporter/default.nix     | 6 ++++--
 .../monitoring/prometheus/nginx_exporter/default.nix      | 6 ++++--
 .../monitoring/prometheus/node_exporter/default.nix       | 6 ++++--
 pkgs/servers/monitoring/prometheus/prom2json/default.nix  | 6 ++++--
 .../servers/monitoring/prometheus/pushgateway/default.nix | 8 +++++---
 .../monitoring/prometheus/statsd_bridge/default.nix       | 6 ++++--
 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 f2f5eaa6f18..30c728e63ca 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 701ee46d498..924e20b528c 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 a859c437701..dff02d3cc92 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 63c421cd8a2..9ff421aa212 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 fec66af2469..1fd9224e17f 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 0b399d0cfff..127dc752e14 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 b45b2784042..b716bdd1722 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 922c958b3f5..8635228a612 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 368ea3ae214..716f3c8bf54 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 ae1e1e38902..1b0fcd7485e 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 31acf79c813..52672edcdb6 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

From 94407ad644c62357ad952a131027893b1cfaf926 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 15:20:55 -0700
Subject: [PATCH 03/17] prometheus-alertmanager: streamline build, prune
 buildInputs

It turns out it's no longer necessary to run the protoc and
static-asset compile steps ourselves, as those are included in the
upstream repo now.
---
 .../prometheus/alertmanager/default.nix       | 41 ++++++-------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 30c728e63ca..91b4bb9e9f9 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }:
+{ stdenv, lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-alertmanager-${rev}";
@@ -12,40 +12,25 @@ let self = goPackages.buildGoPackage rec {
     sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
   };
 
-  buildInputs = [
-    goPackages.protobuf.bin
-    goPackages.fsnotify.v0
-    goPackages.httprouter
-    goPackages.prometheus.client_golang
-    goPackages.prometheus.log
-    goPackages.pushover
-    protobuf
-    vim
+  buildInputs = with goPackages; [
+    fsnotify.v0
+    httprouter
+    prometheus.client_golang
+    prometheus.log
+    pushover
   ];
 
   buildFlagsArray = ''
     -ldflags=
-        -X main.buildVersion ${rev}
-        -X main.buildBranch master
-        -X main.buildUser nix@nixpkgs
-        -X main.buildDate 20150101-00:00:00
-        -X main.goVersion ${lib.getVersion goPackages.go}
-  '';
-
-  preBuild = ''
-  (
-    cd "go/src/$goPackagePath"
-    protoc --proto_path=./config \
-           --go_out=./config/generated/ \
-           ./config/config.proto
-    cd web
-    ${stdenv.shell} blob/embed-static.sh static templates \
-      | gofmt > blob/files.go
-  )
+        -X main.buildVersion=${rev}
+        -X main.buildBranch=master
+        -X main.buildUser=nix@nixpkgs
+        -X main.buildDate=20150101-00:00:00
+        -X main.goVersion=${lib.getVersion goPackages.go}
   '';
 
   meta = with lib; {
-    description = "Alerting dispather for the Prometheus monitoring system";
+    description = "Alert dispatcher for the Prometheus monitoring system";
     homepage = "https://github.com/prometheus/alertmanager";
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];

From e734ce05b86974738c5e6c504b5cbf618bf709f2 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 15:27:30 -0700
Subject: [PATCH 04/17] prometheus-pushgateway: move go-bindata into
 nativeBuildInputs

Thereotically make life easier for a future cross-compilation path.
---
 .../prometheus/pushgateway/default.nix          | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index 1b0fcd7485e..5d21b53ab72 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -15,21 +15,24 @@ let self = buildGoPackage rec {
   };
 
   buildInputs = [
-    go-bindata.bin
     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}
+        -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 = ''

From ff03cf23c667d0656380613bb8e56486bff13f18 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 22:30:26 -0700
Subject: [PATCH 05/17] prometheus-*: trivial cleanup

---
 pkgs/servers/monitoring/prometheus/alertmanager/default.nix   | 4 ++--
 .../monitoring/prometheus/collectd_exporter/default.nix       | 2 +-
 pkgs/servers/monitoring/prometheus/default.nix                | 2 +-
 .../monitoring/prometheus/haproxy_exporter/default.nix        | 2 +-
 pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix | 2 +-
 pkgs/servers/monitoring/prometheus/node_exporter/default.nix  | 2 +-
 pkgs/servers/monitoring/prometheus/pushgateway/default.nix    | 2 +-
 pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
index 91b4bb9e9f9..36867f17da3 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-alertmanager-${rev}";
@@ -31,7 +31,7 @@ let self = goPackages.buildGoPackage rec {
 
   meta = with lib; {
     description = "Alert dispatcher for the Prometheus monitoring system";
-    homepage = "https://github.com/prometheus/alertmanager";
+    homepage = https://github.com/prometheus/alertmanager;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
index dff02d3cc92..d652347fdab 100644
--- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
@@ -16,7 +16,7 @@ let self = goPackages.buildGoPackage rec {
 
   meta = with lib; {
     description = "Relay server for exporting metrics from collectd to Prometheus";
-    homepage = "https://github.com/prometheus/alertmanager";
+    homepage = https://github.com/prometheus/alertmanager;
     license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index bdf87e279ba..86399363fe2 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, vim }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-${version}";
diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
index 9ff421aa212..8ea0677d163 100644
--- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub, }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-haproxy-exporter-0.4.0";
diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
index 1fd9224e17f..d9b78bcc0b9 100644
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-mesos-exporter-${rev}";
diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
index 8635228a612..2aff12a42a4 100644
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 with goPackages;
 
diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
index 5d21b53ab72..ee6d071a84c 100644
--- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
+++ b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 with goPackages;
 
diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
index 52672edcdb6..f4dea0b7580 100644
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
+{ lib, goPackages, fetchFromGitHub }:
 
 let self = goPackages.buildGoPackage rec {
   name = "prometheus-statsd-bridge-${version}";

From d74e65bd6f85878758b0ff1bf7f7a2e2a2b6550e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 22:46:57 -0700
Subject: [PATCH 06/17] prometheus: fold definition into go-packages.nix

---
 .../servers/monitoring/prometheus/default.nix | 57 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 54 ++++++++++++++++++
 3 files changed, 55 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
deleted file mode 100644
index 86399363fe2..00000000000
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-${version}";
-  version = "0.15.1";
-  goPackagePath = "github.com/prometheus/prometheus";
-  rev = "64349aade284846cb194be184b1b180fca629a7c";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "prometheus";
-    sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
-  };
-
-  buildInputs = with goPackages; [
-    consul
-    dns
-    fsnotify.v1
-    go-zookeeper
-    goleveldb
-    httprouter
-    logrus
-    net
-    prometheus.client_golang
-    prometheus.log
-    yaml-v2
-  ];
-
-  preInstall = ''
-    mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
-    cp -a $src/documentation/* $bin/share/doc/prometheus
-    cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
-  '';
-
-  # Metadata that gets embedded into the binary
-  buildFlagsArray = let t = "${goPackagePath}/version"; in
-  ''
-    -ldflags=
-        -X ${t}.Version=${version}
-        -X ${t}.Revision=${builtins.substring 0 6 rev}
-        -X ${t}.Branch=master
-        -X ${t}.BuildUser=nix@nixpkgs
-        -X ${t}.BuildDate=20150101-00:00:00
-        -X ${t}.GoVersion=${lib.getVersion goPackages.go}
-  '';
-
-  meta = with lib; {
-    description = "Service monitoring system and time series database";
-    homepage = http://prometheus.io;
-    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 b101735627b..a94a5b780d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9197,7 +9197,7 @@ let
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
-  prometheus = callPackage ../servers/monitoring/prometheus { };
+  prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager =
     callPackage ../servers/monitoring/prometheus/alertmanager { };
   prometheus-cli =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8677855802d..0d55c765cfb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1998,6 +1998,60 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
+  prometheus.prometheus = buildGoPackage rec {
+    name = "prometheus-${version}";
+    version = "0.15.1";
+    goPackagePath = "github.com/prometheus/prometheus";
+    rev = "64349aade284846cb194be184b1b180fca629a7c";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "prometheus";
+      repo = "prometheus";
+      sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
+    };
+
+    buildInputs = [
+      consul
+      dns
+      fsnotify.v1
+      go-zookeeper
+      goleveldb
+      httprouter
+      logrus
+      net
+      prometheus.client_golang
+      prometheus.log
+      yaml-v2
+    ];
+
+    preInstall = ''
+      mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus"
+      cp -a $src/documentation/* $bin/share/doc/prometheus
+      cp -a $src/console_libraries $src/consoles $bin/etc/prometheus
+    '';
+
+    # Metadata that gets embedded into the binary
+    buildFlagsArray = let t = "${goPackagePath}/version"; in
+    ''
+      -ldflags=
+          -X ${t}.Version=${version}
+          -X ${t}.Revision=${builtins.substring 0 6 rev}
+          -X ${t}.Branch=master
+          -X ${t}.BuildUser=nix@nixpkgs
+          -X ${t}.BuildDate=20150101-00:00:00
+          -X ${t}.GoVersion=${stdenv.lib.getVersion go}
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Service monitoring system and time series database";
+      homepage = http://prometheus.io;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   pty = buildFromGitHub {
     rev    = "67e2db24c831afa6c64fc17b4a143390674365ef";
     owner  = "kr";

From 87655d9fe8d7e43a7947384345f95f0c9cd7b5ec Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 22:55:22 -0700
Subject: [PATCH 07/17] prometheus-alertmanager: fold into go-packages.nix

---
 .../prometheus/alertmanager/default.nix       | 41 -------------------
 pkgs/top-level/all-packages.nix               |  5 ++-
 pkgs/top-level/go-packages.nix                | 38 +++++++++++++++++
 3 files changed, 41 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/alertmanager/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
deleted file mode 100644
index 36867f17da3..00000000000
--- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-alertmanager-${rev}";
-  rev = "0.0.4";
-  goPackagePath = "github.com/prometheus/alertmanager";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "alertmanager";
-    inherit rev;
-    sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
-  };
-
-  buildInputs = with goPackages; [
-    fsnotify.v0
-    httprouter
-    prometheus.client_golang
-    prometheus.log
-    pushover
-  ];
-
-  buildFlagsArray = ''
-    -ldflags=
-        -X main.buildVersion=${rev}
-        -X main.buildBranch=master
-        -X main.buildUser=nix@nixpkgs
-        -X main.buildDate=20150101-00:00:00
-        -X main.goVersion=${lib.getVersion goPackages.go}
-  '';
-
-  meta = with lib; {
-    description = "Alert dispatcher for the Prometheus monitoring system";
-    homepage = https://github.com/prometheus/alertmanager;
-    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 a94a5b780d0..9ca528f0ed9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9197,9 +9197,10 @@ let
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
+
   prometheus = goPackages.prometheus.prometheus.bin;
-  prometheus-alertmanager =
-    callPackage ../servers/monitoring/prometheus/alertmanager { };
+  prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
+
   prometheus-cli =
     callPackage ../servers/monitoring/prometheus/cli { };
   prometheus-collectd-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 0d55c765cfb..b71f05724b7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1956,6 +1956,44 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
+  prometheus.alertmanager = buildGoPackage rec {
+    name = "prometheus-alertmanager-${rev}";
+    rev = "0.0.4";
+    goPackagePath = "github.com/prometheus/alertmanager";
+
+    src = fetchFromGitHub {
+      owner = "prometheus";
+      repo = "alertmanager";
+      inherit rev;
+      sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
+    };
+
+    buildInputs = [
+      fsnotify.v0
+      httprouter
+      prometheus.client_golang
+      prometheus.log
+      pushover
+    ];
+
+    buildFlagsArray = ''
+      -ldflags=
+          -X main.buildVersion=${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 = "Alert dispatcher for the Prometheus monitoring system";
+      homepage = https://github.com/prometheus/alertmanager;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.client_golang = buildFromGitHub rec {
     rev = "0.7.0";
     date = rev;  # Trick buildFromGitHub into keeping the version number

From 853602fae52ef09f7810ade49608801ccee24b0e Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:17:13 -0700
Subject: [PATCH 08/17] prometheus-cli: fold into go-packages.nix

---
 .../monitoring/prometheus/cli/default.nix     | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 20 +++++++++++++
 3 files changed, 21 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/cli/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix
deleted file mode 100644
index 924e20b528c..00000000000
--- a/pkgs/servers/monitoring/prometheus/cli/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-cli-${rev}";
-  rev = "0.3.0";
-  goPackagePath = "github.com/prometheus/prometheus_cli";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "prometheus_cli";
-    inherit rev;
-    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
-  };
-
-  buildInputs = [
-    goPackages.prometheus.client_model
-    goPackages.prometheus.client_golang
-  ];
-
-  meta = with lib; {
-    description = "Command line tool for querying the Prometheus HTTP API";
-    homepage = https://github.com/prometheus/prometheus_cli;
-    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 9ca528f0ed9..3fc6a34b3df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9200,9 +9200,8 @@ let
 
   prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
+  prometheus-cli = goPackages.prometheus.cli.bin;
 
-  prometheus-cli =
-    callPackage ../servers/monitoring/prometheus/cli { };
   prometheus-collectd-exporter =
     callPackage ../servers/monitoring/prometheus/collectd_exporter { };
   prometheus-haproxy-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b71f05724b7..397bcccc80d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2010,6 +2010,26 @@ let
     ];
   };
 
+  prometheus.cli = buildFromGitHub {
+    rev = "0.3.0";
+    owner = "prometheus";
+    repo = "prometheus_cli";
+    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
+
+    buildInputs = [
+      prometheus.client_model
+      prometheus.client_golang
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Command line tool for querying the Prometheus HTTP API";
+      homepage = https://github.com/prometheus/prometheus_cli;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.client_model = buildFromGitHub {
     rev    = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
     date   = "2015-02-12";

From fe5a2b0a39f03bcca17d22fc96a6df828a551f63 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:19:48 -0700
Subject: [PATCH 09/17] prom2json: fold into go-packages.nix

---
 .../prometheus/prom2json/default.nix          | 30 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 21 +++++++++++++
 3 files changed, 22 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/prom2json/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix
deleted file mode 100644
index 716f3c8bf54..00000000000
--- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ goPackages, lib, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prom2json-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/prom2json";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "prom2json";
-    inherit rev;
-    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
-  };
-
-  buildInputs = with goPackages; [
-    golang_protobuf_extensions
-    prometheus.client_golang
-    protobuf
-  ];
-
-  meta = with lib; {
-    description = "A tool to scrape a Prometheus client and dump the result as JSON";
-    homepage = https://github.com/prometheus/prom2json;
-    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 3fc6a34b3df..14713821ba1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9196,8 +9196,7 @@ let
 
   postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { };
 
-  prom2json = callPackage ../servers/monitoring/prometheus/prom2json { };
-
+  prom2json = goPackages.prometheus.prom2json.bin;
   prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
   prometheus-cli = goPackages.prometheus.cli.bin;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 397bcccc80d..a098da3635c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2056,6 +2056,27 @@ let
     sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
   };
 
+  prometheus.prom2json = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "prom2json";
+    sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl";
+
+    buildInputs = [
+      golang_protobuf_extensions
+      prometheus.client_golang
+      protobuf
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Tool to scrape a Prometheus client and dump the result as JSON";
+      homepage = https://github.com/prometheus/prom2json;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.prometheus = buildGoPackage rec {
     name = "prometheus-${version}";
     version = "0.15.1";

From c5b6f17e1c50dee2ada7597266bd87f294d28980 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:30:27 -0700
Subject: [PATCH 10/17] prometheus-collectd-exporter: fold into go-packages.nix

---
 .../prometheus/collectd_exporter/default.nix  | 26 -------------------
 pkgs/top-level/all-packages.nix               |  3 +--
 pkgs/top-level/go-packages.nix                | 20 +++++++++++---
 3 files changed, 17 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
deleted file mode 100644
index d652347fdab..00000000000
--- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ goPackages, lib, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-collectd-exporter-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/collectd_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "collectd_exporter";
-    inherit rev;
-    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
-  };
-
-  buildInputs = [ goPackages.prometheus.client_golang ];
-
-  meta = with lib; {
-    description = "Relay server for exporting metrics from collectd to Prometheus";
-    homepage = https://github.com/prometheus/alertmanager;
-    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 14713821ba1..74b58353e63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9200,9 +9200,8 @@ let
   prometheus = goPackages.prometheus.prometheus.bin;
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
   prometheus-cli = goPackages.prometheus.cli.bin;
+  prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin;
 
-  prometheus-collectd-exporter =
-    callPackage ../servers/monitoring/prometheus/collectd_exporter { };
   prometheus-haproxy-exporter =
     callPackage ../servers/monitoring/prometheus/haproxy_exporter { };
   prometheus-mesos-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a098da3635c..f1fdb6a3a1d 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -384,7 +384,6 @@ let
 
   consul = buildFromGitHub rec {
     rev = "v0.5.2";
-    date = rev;
     owner = "hashicorp";
     repo = "consul";
     sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
@@ -1591,7 +1590,6 @@ let
 
   logrus = buildFromGitHub rec {
     rev = "v0.8.6";
-    date = rev;  # Trick buildFromGitHub into keeping the version number.
     owner = "Sirupsen";
     repo = "logrus";
     sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
@@ -1994,9 +1992,8 @@ let
     };
   };
 
-  prometheus.client_golang = buildFromGitHub rec {
+  prometheus.client_golang = buildFromGitHub {
     rev = "0.7.0";
-    date = rev;  # Trick buildFromGitHub into keeping the version number
     owner = "prometheus";
     repo = "client_golang";
     sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
@@ -2039,6 +2036,21 @@ let
     buildInputs = [ protobuf ];
   };
 
+  prometheus.collectd-exporter = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "collectd_exporter";
+    sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1";
+    buildInputs = [ prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "Relay server for exporting metrics from collectd to Prometheus";
+      homepage = https://github.com/prometheus/alertmanager;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.log = buildFromGitHub {
     rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
     date   = "2015-05-29";

From 9001ad4106c1bab79e5af28a1e7cb554b78111b3 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:37:48 -0700
Subject: [PATCH 11/17] prometheus-haproxy-exporter: fold into go-packages.nix

---
 .../prometheus/haproxy_exporter/default.nix   | 25 -------------------
 pkgs/top-level/all-packages.nix               |  3 +--
 pkgs/top-level/go-packages.nix                | 15 +++++++++++
 3 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
deleted file mode 100644
index 8ea0677d163..00000000000
--- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-haproxy-exporter-0.4.0";
-  goPackagePath = "github.com/prometheus/haproxy_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "haproxy_exporter";
-    rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d";
-    sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr";
-  };
-
-  buildInputs = [ goPackages.prometheus.client_golang ];
-
-  meta = with lib; {
-    description = "HAProxy Exporter for the Prometheus monitoring system";
-    homepage = https://github.com/prometheus/haproxy_exporter;
-    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 74b58353e63..18ada8231dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9201,9 +9201,8 @@ let
   prometheus-alertmanager = goPackages.prometheus.alertmanager.bin;
   prometheus-cli = goPackages.prometheus.cli.bin;
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin;
+  prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin;
 
-  prometheus-haproxy-exporter =
-    callPackage ../servers/monitoring/prometheus/haproxy_exporter { };
   prometheus-mesos-exporter =
     callPackage ../servers/monitoring/prometheus/mesos_exporter { };
   prometheus-mysqld-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f1fdb6a3a1d..33aa17b5979 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2051,6 +2051,21 @@ let
     };
   };
 
+  prometheus.haproxy-exporter = buildFromGitHub {
+    rev = "0.4.0";
+    owner = "prometheus";
+    repo = "haproxy_exporter";
+    sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr";
+    buildInputs = [ prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "HAProxy Exporter for the Prometheus monitoring system";
+      homepage = https://github.com/prometheus/haproxy_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.log = buildFromGitHub {
     rev    = "439e5db48fbb50ebbaf2c816030473a62f505f55";
     date   = "2015-05-29";

From 52dd6ea9d9341a996ab567e7a8714fd1b8e0ddfe Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:47:13 -0700
Subject: [PATCH 12/17] prometheus-mesos-exporter: fold into go-packages.nix

---
 .../prometheus/mesos_exporter/default.nix     | 30 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 15 ++++++++++
 3 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
deleted file mode 100644
index d9b78bcc0b9..00000000000
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-mesos-exporter-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/mesos_exporter";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "prometheus";
-    repo = "mesos_exporter";
-    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
-  };
-
-  buildInputs = [
-    goPackages.mesos-stats
-    goPackages.prometheus.client_golang
-    goPackages.glog
-  ];
-
-  meta = with lib; {
-    description = "Export Mesos metrics to Prometheus";
-    homepage = https://github.com/prometheus/mesos_exporter;
-    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 18ada8231dd..796150da673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9202,9 +9202,8 @@ let
   prometheus-cli = goPackages.prometheus.cli.bin;
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin;
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin;
+  prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin;
 
-  prometheus-mesos-exporter =
-    callPackage ../servers/monitoring/prometheus/mesos_exporter { };
   prometheus-mysqld-exporter =
     callPackage ../servers/monitoring/prometheus/mysqld_exporter { };
   prometheus-nginx-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 33aa17b5979..31a9c8b3a93 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2075,6 +2075,21 @@ let
     propagatedBuildInputs = [ logrus ];
   };
 
+  prometheus.mesos-exporter = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "mesos_exporter";
+    sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm";
+    buildInputs = [ mesos-stats prometheus.client_golang glog ];
+    meta = with stdenv.lib; {
+      description = "Export Mesos metrics to Prometheus";
+      homepage = https://github.com/prometheus/mesos_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From 4f53847ca2eaf50d1b20f564ac4c7ee9ce2d055d Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 29 Aug 2015 23:51:19 -0700
Subject: [PATCH 13/17] prometheus-mysqld-exporter: fold into go-packages.nix

---
 .../prometheus/mysqld_exporter/default.nix    | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 15 ++++++++++
 3 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
deleted file mode 100644
index 127dc752e14..00000000000
--- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ goPackages, lib, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-mysqld-exporter-${rev}";
-  rev = "0.1.0";
-  goPackagePath = "github.com/prometheus/mysqld_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "mysqld_exporter";
-    inherit rev;
-    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
-  };
-
-  buildInputs = with goPackages; [
-    mysql
-    prometheus.client_golang
-  ];
-
-  meta = with lib; {
-    description = "Prometheus exporter for MySQL server metrics";
-    homepage = https://github.com/prometheus/mysqld_exporter;
-    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 796150da673..5a483fa2429 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9203,9 +9203,8 @@ let
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin;
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin;
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin;
+  prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin;
 
-  prometheus-mysqld-exporter =
-    callPackage ../servers/monitoring/prometheus/mysqld_exporter { };
   prometheus-nginx-exporter =
     callPackage ../servers/monitoring/prometheus/nginx_exporter { };
   prometheus-node-exporter =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 31a9c8b3a93..6dfa5192176 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2090,6 +2090,21 @@ let
     };
   };
 
+  prometheus.mysqld-exporter = buildFromGitHub {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "mysqld_exporter";
+    sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9";
+    buildInputs = [ mysql prometheus.client_golang ];
+    meta = with stdenv.lib; {
+      description = "Prometheus exporter for MySQL server metrics";
+      homepage = https://github.com/prometheus/mysqld_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From 6122488297369518cb2bf1b876f9fdf072a27924 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:12:09 -0700
Subject: [PATCH 14/17] prometheus-nginx-exporter: fold into go-packages.nix

---
 .../prometheus/nginx_exporter/default.nix     | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 16 ++++++++++
 3 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
deleted file mode 100644
index b716bdd1722..00000000000
--- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-let self = goPackages.buildGoPackage rec {
-  name = "prometheus-nginx-exporter-${version}";
-  version = "git-2015-06-01";
-  goPackagePath = "github.com/discordianfish/nginx_exporter";
-
-  src = fetchFromGitHub {
-    owner = "discordianfish";
-    repo = "nginx_exporter";
-    rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
-    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
-  };
-
-  buildInputs = [
-    goPackages.prometheus.client_golang
-    goPackages.prometheus.log
-  ];
-
-  meta = with lib; {
-    description = "Metrics relay from nginx stats to Prometheus";
-    homepage = https://github.com/discordianfish/nginx_exporter;
-    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 5a483fa2429..9a623ecb45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9204,9 +9204,8 @@ let
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin;
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin;
   prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin;
+  prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin;
 
-  prometheus-nginx-exporter =
-    callPackage ../servers/monitoring/prometheus/nginx_exporter { };
   prometheus-node-exporter =
     callPackage ../servers/monitoring/prometheus/node_exporter { };
   prometheus-pushgateway =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6dfa5192176..50886200732 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2105,6 +2105,22 @@ let
     };
   };
 
+  prometheus.nginx-exporter = buildFromGitHub {
+    rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b";
+    date = "2015-06-01";
+    owner = "discordianfish";
+    repo = "nginx_exporter";
+    sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc";
+    buildInputs = [ prometheus.client_golang prometheus.log ];
+    meta = with stdenv.lib; {
+      description = "Metrics relay from nginx stats to Prometheus";
+      homepage = https://github.com/discordianfish/nginx_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From 4c95e495931520e8104eba5d2fa065ff8b030933 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:16:00 -0700
Subject: [PATCH 15/17] prometheus-node-exporter: fold into go-packages.nix

---
 .../prometheus/node_exporter/default.nix      | 35 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 24 +++++++++++++
 3 files changed, 25 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/node_exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
deleted file mode 100644
index 2aff12a42a4..00000000000
--- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, goPackages, fetchFromGitHub }:
-
-with goPackages;
-
-let self = buildGoPackage rec {
-  name = "prometheus-node-exporter-${rev}";
-  rev = "0.10.0";
-  goPackagePath = "github.com/prometheus/node_exporter";
-
-  src = fetchFromGitHub {
-    owner = "prometheus";
-    repo = "node_exporter";
-    inherit rev;
-    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
-  };
-
-  buildInputs = [
-    go-runit
-    ntp
-    prometheus.client_golang
-    prometheus.client_model
-    prometheus.log
-    protobuf
-  ];
-
-  meta = with lib; {
-    description = "Prometheus exporter for machine metrics";
-    homepage = https://github.com/prometheus/node_exporter;
-    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 9a623ecb45a..11067e8ed35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9205,9 +9205,8 @@ let
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin;
   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-node-exporter =
-    callPackage ../servers/monitoring/prometheus/node_exporter { };
   prometheus-pushgateway =
     callPackage ../servers/monitoring/prometheus/pushgateway { };
   prometheus-statsd-bridge =
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 50886200732..3a70e93db32 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2121,6 +2121,30 @@ let
     };
   };
 
+  prometheus.node-exporter = buildFromGitHub {
+    rev = "0.10.0";
+    owner = "prometheus";
+    repo = "node_exporter";
+    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
+
+    buildInputs = [
+      go-runit
+      ntp
+      prometheus.client_golang
+      prometheus.client_model
+      prometheus.log
+      protobuf
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Prometheus exporter for machine metrics";
+      homepage = https://github.com/prometheus/node_exporter;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ benley ];
+      platforms = platforms.unix;
+    };
+  };
+
   prometheus.procfs = buildFromGitHub {
     rev    = "c91d8eefde16bd047416409eb56353ea84a186e4";
     date   = "2015-06-16";

From d17a29a15093ce80a1a0ad0aed0b4cce3fc5b220 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:22:09 -0700
Subject: [PATCH 16/17] prometheus-pushgateway: fold into go-packages.nix

---
 .../prometheus/pushgateway/default.nix        | 55 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 pkgs/top-level/go-packages.nix                | 40 ++++++++++++++
 3 files changed, 41 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/pushgateway/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix
deleted file mode 100644
index ee6d071a84c..00000000000
--- 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 11067e8ed35..2dc120ac50e 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 3a70e93db32..6dc6168a2a1 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";

From 395c268ab7528331a8260431dec276cafccad7dd Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 30 Aug 2015 00:26:10 -0700
Subject: [PATCH 17/17] prometheus-statsd-bridge: fold into go-packages.nix

---
 .../prometheus/statsd_bridge/default.nix      | 29 -------------------
 pkgs/top-level/all-packages.nix               |  4 +--
 pkgs/top-level/go-packages.nix                | 15 ++++++++++
 3 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix

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 f4dea0b7580..00000000000
--- 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 2dc120ac50e..4b138b84e6a 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 6dc6168a2a1..4c71c632a07 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";