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] 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";