From 92872f8983b2a8f8be26d64362642c22981578da Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Tue, 4 Jun 2019 15:03:35 -0300
Subject: Build shell buildInputs in test derivation

This way we make sure the =shell= derivation always builds, instead of seeing
these kinds of failure during CI runs when it's trying to deploy.
---
 default.nix | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/default.nix b/default.nix
index 4ea1ec0..e412399 100644
--- a/default.nix
+++ b/default.nix
@@ -30,6 +30,20 @@ in rec {
         touch $out
       '';
     });
+    shellEnvironment = utils.baseTask.overrideAttrs (baseAttrs: {
+      name = "${baseAttrs.name}-shell-inputs";
+      buildInputs = with pkgs; [
+        gitMinimal
+        git-crypt
+        gettext
+        terraform-providers.digitalocean
+        terraform
+      ];
+      buildPhase = ''
+        echo "Can build!"
+        echo noop > $out
+      '';
+    });
   };
   test = utils.test [
     (utils.shellcheck null)
@@ -37,16 +51,11 @@ in rec {
     utils.formatNix
     subtasks.formatTerraform
     subtasks.dockerComposeLint
+    subtasks.shellEnvironment
   ];
   # Used in .build.yml to run Bash scripts
   shell = pkgs.mkShell rec {
     name = "vps-shell";
-    buildInputs = with pkgs; [
-      gitMinimal
-      git-crypt
-      gettext
-      terraform-providers.digitalocean
-      terraform
-    ];
+    buildInputs = subtasks.shellEnvironment.buildInputs;
   };
 }
-- 
cgit v1.2.3