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] 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 86399363fe24..000000000000
--- 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 b101735627bd..a94a5b780d0c 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 8677855802dc..0d55c765cfb4 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";