From 55cf272c195d0a9f5c6cdef60fd6171f42367d53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 2 Dec 2014 12:59:14 +0100
Subject: [PATCH] fixes #5198

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

diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 067c826f4e4..7a53ce17454 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -30,7 +30,6 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.bosun;
         example = literalExample "pkgs.bosun";
         description = ''
           bosun binary to use.
@@ -94,8 +93,9 @@ in {
 
   };
 
-  config = mkIf config.services.bosun.enable {
-
+  config = mkIf cfg.enable {
+  
+    services.bosun.package = mkDefault pkgs.bosun; 
 
     systemd.services.bosun = {
       description = "bosun metrics collector (part of Bosun)";
diff --git a/nixos/modules/virtualisation/kubernetes.nix b/nixos/modules/virtualisation/kubernetes.nix
index 50388cf2e12..e01499822ad 100644
--- a/nixos/modules/virtualisation/kubernetes.nix
+++ b/nixos/modules/virtualisation/kubernetes.nix
@@ -12,7 +12,6 @@ in {
   options.virtualisation.kubernetes = {
     package = mkOption {
       description = "Kubernetes package to use.";
-      default = pkgs.kubernetes;
       type = types.package;
     };
 
@@ -443,6 +442,8 @@ in {
         cfg.kubelet.enable ||
         cfg.proxy.enable
     ) {
+      virtualisation.kubernetes.package = mkDefault pkgs.kubernetes; 
+
       environment.systemPackages = [ cfg.package ];
 
       users.extraUsers = singleton {