diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix
new file mode 100644
index 000000000000..5dd7c207f104
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/cli.nix
@@ -0,0 +1,28 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "prometheus_cli-${version}";
+  version = "0.3.0";
+  rev = version;
+
+  goPackagePath = "github.com/prometheus/prometheus_cli";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/prometheus/prometheus_cli";
+    sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn";
+  };
+
+  goDeps = ./cli_deps.json;
+
+  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;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.json b/pkgs/servers/monitoring/prometheus/cli_deps.json
new file mode 100644
index 000000000000..506263b51f24
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/cli_deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/prometheus/client_golang"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9858aa453c83..60c17c0be72b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10180,7 +10180,7 @@ in
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
-  prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; };
+  prometheus-cli = callPackage ../servers/monitoring/prometheus/cli.nix { };
   prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; };
   prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index c1cf3388d073..e15da20cf3f9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2579,26 +2579,6 @@ 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";
     version = "2015-02-12";