From ed140ff9272885b62dc896ae36e80c251b49917a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 4 Sep 2015 21:46:10 +0200
Subject: bosun,scollector: Fix NixOS modules to use bin attr of go pkgs

---
 nixos/modules/services/monitoring/bosun.nix      | 5 ++---
 nixos/modules/services/monitoring/scollector.nix | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'nixos/modules/services/monitoring')

diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 7a53ce17454..50f621ef307 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -30,7 +30,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        example = literalExample "pkgs.bosun";
+        default = pkgs.bosun.bin;
+        example = literalExample "pkgs.bosun.bin";
         description = ''
           bosun binary to use.
         '';
@@ -95,8 +96,6 @@ in {
 
   config = mkIf cfg.enable {
   
-    services.bosun.package = mkDefault pkgs.bosun; 
-
     systemd.services.bosun = {
       description = "bosun metrics collector (part of Bosun)";
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix
index 8b97daf8881..cac0a809c96 100644
--- a/nixos/modules/services/monitoring/scollector.nix
+++ b/nixos/modules/services/monitoring/scollector.nix
@@ -42,8 +42,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.scollector;
-        example = literalExample "pkgs.scollector";
+        default = pkgs.scollector.bin;
+        example = literalExample "pkgs.scollector.bin";
         description = ''
           scollector binary to use.
         '';
-- 
cgit 1.4.1