From f1f6a81b9aa33aa5471e29b6bf71a30e5f4172c4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 5 Mar 2018 21:46:12 +0100
Subject: [PATCH] buildkite: remove package from test closure

---
 release.nix                                                 | 2 +-
 tests/{buildkite-agent.nix => services-buildkite-agent.nix} | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename tests/{buildkite-agent.nix => services-buildkite-agent.nix} (87%)

diff --git a/release.nix b/release.nix
index 0b6e5384..6d50d575 100644
--- a/release.nix
+++ b/release.nix
@@ -98,6 +98,7 @@ let
     tests.nixpkgs-overlays = makeTest ./tests/nixpkgs-overlays.nix;
     tests.programs-zsh = makeTest ./tests/programs-zsh.nix;
     tests.services-activate-system = makeTest ./tests/services-activate-system.nix;
+    tests.services-buildkite-agent = makeTest ./tests/services-buildkite-agent.nix;
     tests.services-skhd = makeTest ./tests/services-skhd.nix;
     tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
     tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
@@ -106,7 +107,6 @@ let
     tests.system-path-fish = makeTest ./tests/system-path-fish.nix;
     tests.system-shells = makeTest ./tests/system-shells.nix;
     tests.users-groups = makeTest ./tests/users-groups.nix;
-    tests.buildkite-agent = makeTest ./tests/buildkite-agent.nix;
 
   }
   // (mapTestOn (packagePlatforms packageSet));
diff --git a/tests/buildkite-agent.nix b/tests/services-buildkite-agent.nix
similarity index 87%
rename from tests/buildkite-agent.nix
rename to tests/services-buildkite-agent.nix
index 29f321e4..518d3ac3 100644
--- a/tests/buildkite-agent.nix
+++ b/tests/services-buildkite-agent.nix
@@ -1,10 +1,14 @@
 { config, pkgs, ... }:
 
 let
+  buildkite-agent = pkgs.runCommand "buildkite-agent-0.0.0" {} "mkdir $out";
   tokenPath = pkgs.writeText "buildkite_token" "TEST_TOKEN";
-in {
+in
+
+{
   services.buildkite-agent = {
     enable = true;
+    package = buildkite-agent;
     extraConfig = "yolo=1";
     openssh.privateKeyPath = "/dev/null";
     openssh.publicKeyPath = "/dev/null";