aboutsummaryrefslogtreecommitdiff
path: root/src/main.rs
diff options
context:
space:
mode:
authornotgne22020-10-05 19:46:28 -0700
committernotgne22020-10-05 19:46:28 -0700
commit7c00fd2761e6efffe763ece5d08d9a6d3fb95092 (patch)
tree9d4030bd4788bec3eb4783adc38130536d8fa696 /src/main.rs
parent5674670a59168fb05f26e5b4fb41dd2662810e94 (diff)
Add interface with json schema, fix flake-less issues, put setActivate and jsonSchema check in flake lib
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs
index 0d80e42..219c3e5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@ use tokio::process::Command;
use merge::Merge;
extern crate pretty_env_logger;
+
#[macro_use]
extern crate log;
@@ -177,12 +178,14 @@ async fn get_deployment_data(
let mut c = match supports_flakes {
true => Command::new("nix"),
- false => Command::new("nix-instanciate"),
+ false => Command::new("nix-instantiate"),
};
let mut build_command = match supports_flakes {
true => {
- c.arg("eval").arg("--json").arg(format!("{}#deploy", repo))
+ c.arg("eval")
+ .arg("--json")
+ .arg(format!("{}#deploy", repo))
}
false => {
c
@@ -190,7 +193,7 @@ async fn get_deployment_data(
.arg("--read-write-mode")
.arg("--json")
.arg("--eval")
- .arg("--E")
+ .arg("-E")
.arg(format!("let r = import {}/.; in if builtins.isFunction r then (r {{}}).deploy else r.deploy", repo))
}
};