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] 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 924e20b528cd..000000000000
--- 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 9ca528f0ed98..3fc6a34b3df8 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 b71f05724b79..397bcccc80d3 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";