Add a cmd field on a Nix command failure error

typhon-ci · Jul 9, 2023 · 89eb1be · 89eb1be
1 parent 5a00c87
commit 89eb1be
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/typhon/src/nix.rs b/typhon/src/nix.rs
@@ -10,10 +10,18 @@ use tokio::process::Command;
 #[derive(Debug)]
 pub enum Error {
     SerdeJson(serde_json::Error),
-    UnexpectedOutput { context: String },
+    UnexpectedOutput {
+        context: String,
+    },
     FromUtf8Error(std::string::FromUtf8Error),
-    NixCommand { stdout: String, stderr: String },
-    ExpectedDrvGotAttrset { expr: String },
+    NixCommand {
+        cmd: String,
+        stdout: String,
+        stderr: String,
+    },
+    ExpectedDrvGotAttrset {
+        expr: String,
+    },
     BuildFailed,
 }
 
@@ -56,7 +64,11 @@ impl CommandExtTrait for Command {
         let stderr = String::from_utf8(nix_output.stderr)?;
 
         if !nix_output.status.success() {
-            Err(Error::NixCommand { stdout, stderr })
+            Err(Error::NixCommand {
+                cmd: format!("{:?}", self),
+                stdout,
+                stderr,
+            })
         } else {
             Ok(stdout)
         }