Merge pull request #1506 from cachix/fix-update-input-warning

devenv: fix warning about `--update-input` when running `devenv update`
cachix · Oct 8, 2024 · f16bfde · f16bfde
2 parents 4bcf93e + 135255b
commit f16bfde
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/devenv-eval-cache/src/internal_log.rs b/devenv-eval-cache/src/internal_log.rs
@@ -57,7 +57,8 @@ impl InternalLog {
             // to filter things out. Our hunch is that these messages are coming from the
             // nix daemon.
             InternalLog::Msg { msg, level, .. }
-                if *level == Verbosity::Error && (self.is_nix_error() || self.is_builtin_trace()) =>
+                if *level == Verbosity::Error
+                    && (self.is_nix_error() || self.is_builtin_trace()) =>
             {
                 Some(msg.clone())
             }

diff --git a/devenv/src/cnix.rs b/devenv/src/cnix.rs
@@ -217,20 +217,14 @@ impl<'a> Nix<'a> {
     }
 
     pub async fn update(&self, input_name: &Option<String>) -> Result<()> {
-        match input_name {
-            Some(input_name) => {
-                self.run_nix(
-                    "nix",
-                    &["flake", "lock", "--update-input", input_name],
-                    &self.options,
-                )
-                .await?;
-            }
-            None => {
-                self.run_nix("nix", &["flake", "update"], &self.options)
-                    .await?;
-            }
+        let mut args = vec!["flake", "update"];
+
+        if let Some(input_name) = input_name {
+            args.push(input_name);
         }
+
+        self.run_nix("nix", &args, &self.options).await?;
+
         Ok(())
     }