diff options
| -rw-r--r-- | tvix/cli/src/derivation.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tvix/cli/src/derivation.rs b/tvix/cli/src/derivation.rs index b245d9d5d5..2b12f6dd73 100644 --- a/tvix/cli/src/derivation.rs +++ b/tvix/cli/src/derivation.rs @@ -106,8 +106,10 @@ fn populate_output_configuration( hash_algo: Option<String>, // in nix: outputHashAlgo hash_mode: Option<String>, // in nix: outputHashmode ) -> Result<(), ErrorKind> { - match (hash, hash_algo, hash_mode) { - (Some(digest), Some(algo), hash_mode) => match drv.outputs.get_mut("out") { + // We only do something when `digest` and `algo` are `Some(_)``, and + // there's an `out` output. + if let (Some(digest), Some(algo), hash_mode) = (hash, hash_algo, hash_mode) { + match drv.outputs.get_mut("out") { None => return Err(Error::ConflictingOutputTypes.into()), Some(out) => { let sri_parsed = digest.parse::<ssri::Integrity>(); @@ -176,9 +178,7 @@ fn populate_output_configuration( out.hash = Some(Hash { algo, digest }); } - }, - - _ => {} + } } Ok(()) |