ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

nix_eval_jobs: Pass the expression on the command line

Browse source 
This gets rid of the temporary file.
This commit is contained in:
Zhaofeng Li 2022-08-17 01:09:43 -06:00
parent 976849028b
commit 7aa1607a3c
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix/evaluator/nix_eval_jobs.rs
View file

@ -5,7 +5,6 @@
//! During build time, the nix-eval-jobs binary may be pinned by setting //! During build time, the nix-eval-jobs binary may be pinned by setting
//! the `NIX_EVAL_JOBS` environment variable. //! the `NIX_EVAL_JOBS` environment variable.
use std::io::Write;
use std::path::PathBuf; use std::path::PathBuf;
use std::pin::Pin; use std::pin::Pin;
use std::process::Stdio; use std::process::Stdio;
@ -14,7 +13,6 @@ use async_stream::stream;
use async_trait::async_trait; use async_trait::async_trait;
use futures::Stream; use futures::Stream;
use serde::Deserialize; use serde::Deserialize;
use tempfile::NamedTempFile;
use tokio::io::{AsyncBufReadExt, BufReader}; use tokio::io::{AsyncBufReadExt, BufReader};
use tokio::process::Command; use tokio::process::Command;
@ -78,17 +76,11 @@ impl DrvSetEvaluator for NixEvalJobs {
expression: &dyn NixExpression, expression: &dyn NixExpression,
options: NixOptions, options: NixOptions,
) -> ColmenaResult<Pin<Box<dyn Stream<Item = EvalResult>>>> { ) -> ColmenaResult<Pin<Box<dyn Stream<Item = EvalResult>>>> {
let expr_file = {
let mut f = NamedTempFile::new()?;
f.write_all(expression.expression().as_bytes())?;
f.into_temp_path()
};
let mut command = Command::new(&self.executable); let mut command = Command::new(&self.executable);
command command
.arg("--workers") .arg("--workers")
.arg(self.workers.to_string()) .arg(self.workers.to_string())
.arg(&expr_file); .args(&["--expr", &expression.expression()]);
command.args(options.to_args()); command.args(options.to_args());
@ -158,8 +150,6 @@ impl DrvSetEvaluator for NixEvalJobs {
} }
} }
} }
drop(expr_file);
})) }))
} }