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] 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 36867f17da34..000000000000
--- 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 a94a5b780d0c..9ca528f0ed98 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 0d55c765cfb4..b71f05724b79 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