Merge pull request #1753 from cachix/fix-search

devenv: improve `devenv search` performance and hide warnings

Author: domenkozar

devenv/src/cnix.rs

@@ -14,8 +14,8 @@ use std::process;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tracing::{debug, error, info, warn};
 
-pub struct Nix<'a> {
-    pub options: Options<'a>,
+pub struct Nix {
+    pub options: Options,
     pool: SqlitePool,
     // TODO: all these shouldn't be here
     config: config::Config,
@@ -29,7 +29,7 @@ pub struct Nix<'a> {
 }
 
 #[derive(Clone)]
-pub struct Options<'a> {
+pub struct Options {
     /// Run `exec` to replace the shell with the command.
     pub replace_shell: bool,
     /// Error out if the command returns a non-zero status code.
@@ -41,10 +41,10 @@ pub struct Options<'a> {
     /// Log the stdout of the command.
     pub logging_stdout: bool,
     /// Extra flags to pass to nix commands.
-    pub nix_flags: &'a [&'a str],
+    pub nix_flags: &'static [&'static str],
 }
 
-impl Default for Options<'_> {
+impl Default for Options {
     fn default() -> Self {
         Self {
             replace_shell: false,
@@ -68,7 +68,7 @@ impl Default for Options<'_> {
     }
 }
 
-impl<'a> Nix<'a> {
+impl Nix {
     pub async fn new<P: AsRef<Path>>(
         config: config::Config,
         global_options: cli::GlobalOptions,
@@ -186,15 +186,20 @@ impl<'a> Nix<'a> {
         Ok(())
     }
 
-    pub async fn build(&self, attributes: &[&str]) -> Result<Vec<PathBuf>> {
+    pub async fn build(
+        &self,
+        attributes: &[&str],
+        options: Option<Options>,
+    ) -> Result<Vec<PathBuf>> {
         if attributes.is_empty() {
             return Ok(Vec::new());
         }
 
-        let options = Options {
+        let options = options.unwrap_or(Options {
             cache_output: true,
             ..self.options
-        };
+        });
+
         // TODO: use eval underneath
         let mut args: Vec<String> = vec![
             "build".to_string(),
@@ -272,7 +277,18 @@ impl<'a> Nix<'a> {
     pub async fn search(&self, name: &str) -> Result<devenv_eval_cache::Output> {
         self.run_nix_with_substituters(
             "nix",
-            &["search", "--inputs-from", ".", "--json", "nixpkgs", name],
+            &[
+                "search",
+                "--inputs-from",
+                ".",
+                "--quiet",
+                "--option",
+                "eval-cache",
+                "true",
+                "--json",
+                "nixpkgs",
+                name,
+            ],
             &self.options,
         )
         .await
@@ -298,7 +314,7 @@ impl<'a> Nix<'a> {
         &self,
         command: &str,
         args: &[&str],
-        options: &Options<'a>,
+        options: &Options,
     ) -> Result<devenv_eval_cache::Output> {
         let cmd = self.prepare_command(command, args, options)?;
         self.run_nix_command(cmd, options).await
@@ -308,7 +324,7 @@ impl<'a> Nix<'a> {
         &self,
         command: &str,
         args: &[&str],
-        options: &Options<'a>,
+        options: &Options,
     ) -> Result<devenv_eval_cache::Output> {
         let cmd = self
             .prepare_command_with_substituters(command, args, options)
@@ -319,7 +335,7 @@ impl<'a> Nix<'a> {
     async fn run_nix_command(
         &self,
         mut cmd: std::process::Command,
-        options: &Options<'a>,
+        options: &Options,
     ) -> Result<devenv_eval_cache::Output> {
         use devenv_eval_cache::internal_log::Verbosity;
         use devenv_eval_cache::{supports_eval_caching, CachedCommand};
@@ -444,7 +460,7 @@ impl<'a> Nix<'a> {
         &self,
         command: &str,
         args: &[&str],
-        options: &Options<'a>,
+        options: &Options,
     ) -> Result<std::process::Command> {
         let mut final_args = Vec::new();
         let known_keys_str;
@@ -532,7 +548,7 @@ impl<'a> Nix<'a> {
         &self,
         command: &str,
         args: &[&str],
-        options: &Options<'a>,
+        options: &Options,
     ) -> Result<std::process::Command> {
         let mut flags = options.nix_flags.to_vec();
         flags.push("--max-jobs");

devenv/src/devenv.rs

@@ -53,7 +53,7 @@ pub struct Devenv {
     pub config: config::Config,
     pub global_options: cli::GlobalOptions,
 
-    nix: cnix::Nix<'static>,
+    nix: cnix::Nix,
 
     // All kinds of paths
     devenv_root: PathBuf,
@@ -314,7 +314,7 @@ impl Devenv {
 
             let container_store_path = self
                 .nix
-                .build(&[&format!("devenv.containers.{name}.derivation")])
+                .build(&[&format!("devenv.containers.{name}.derivation")], None)
                 .await?;
             let container_store_path = container_store_path[0]
                 .to_str()
@@ -343,7 +343,7 @@ impl Devenv {
         async move {
             let copy_script = self
                 .nix
-                .build(&[&format!("devenv.containers.{name}.copyScript")])
+                .build(&[&format!("devenv.containers.{name}.copyScript")], None)
                 .await?;
             let copy_script = &copy_script[0];
             let copy_script_string = &copy_script.to_string_lossy();
@@ -393,7 +393,7 @@ impl Devenv {
         async move {
             let run_script = self
                 .nix
-                .build(&[&format!("devenv.containers.{name}.dockerRun")])
+                .build(&[&format!("devenv.containers.{name}.dockerRun")], None)
                 .await?;
 
             let status = std::process::Command::new(&run_script[0])
@@ -462,7 +462,15 @@ impl Devenv {
     pub async fn search(&mut self, name: &str) -> Result<()> {
         self.assemble(false)?;
 
-        let options = self.nix.build(&["optionsJSON"]).await?;
+        let build_options = cnix::Options {
+            logging: false,
+            cache_output: true,
+            ..Default::default()
+        };
+        let options = self
+            .nix
+            .build(&["optionsJSON"], Some(build_options))
+            .await?;
         let options_path = options[0]
             .join("share")
             .join("doc")
@@ -531,7 +539,7 @@ impl Devenv {
             // TODO: No newline
             let span = info_span!("tasks_run", devenv.user_message = "Evaluating tasks");
             self.nix
-                .build(&["devenv.task.config"])
+                .build(&["devenv.task.config"], None)
                 .instrument(span)
                 .await?
         };
@@ -566,7 +574,10 @@ impl Devenv {
         // collect tests
         let test_script = {
             let span = info_span!("test", devenv.user_message = "Building tests");
-            self.nix.build(&["devenv.test"]).instrument(span).await?
+            self.nix
+                .build(&["devenv.test"], None)
+                .instrument(span)
+                .await?
         };
         let test_script = test_script[0].to_string_lossy().to_string();
 
@@ -643,7 +654,10 @@ impl Devenv {
         };
         let paths = self
             .nix
-            .build(&attributes.iter().map(AsRef::as_ref).collect::<Vec<&str>>())
+            .build(
+                &attributes.iter().map(AsRef::as_ref).collect::<Vec<&str>>(),
+                None,
+            )
             .await?;
         for path in paths {
             println!("{}", path.display());
@@ -668,7 +682,7 @@ impl Devenv {
             devenv.user_message = "Building processes"
         );
         let proc_script_string = async {
-            let proc_script = self.nix.build(&["procfileScript"]).await?;
+            let proc_script = self.nix.build(&["procfileScript"], None).await?;
             let proc_script_string = proc_script[0]
                 .to_str()
                 .expect("Failed to get proc script path")