Move apps into garlic/apps

garlic/stages/experiment.nix

@@ -3,8 +3,8 @@
 }:
 
 {
-  units:
-}
+  units
+}:
 
 with stdenv.lib;
 

garlic/stages/isolate/default.nix

@@ -9,7 +9,7 @@
 {
   nextStage
 , nixPrefix
-, clusterName
+, clusterName ? "mn4"
 }:
 
 with garlicTools;

garlic/stages/trebuchet.nix

@@ -1,16 +1,21 @@
 {
   stdenv
 , nixtools
+, garlicTools
 }:
 
 {
-  program
+  nextStage
 , nixPrefix
+
+# FIXME: These two should be specified in the configuration of the machine
 , sshHost ? "mn"
 , targetCluster ? "mn4"
-, stage
 }:
 
+let
+  program = garlicTools.stageProgram nextStage;
+in
 stdenv.mkDerivation {
   name = "trebuchet";
   phases = [ "installPhase" ];
@@ -25,7 +30,7 @@ stdenv.mkDerivation {
     # to see what is being executed.
 
     #  $out
-    ${stage.desc}
+    ${nextStage.desc}
 
     nixtools=${nixPrefix}${nixtools}/bin
     runexp=\$nixtools/${targetCluster}/runexp