diff --git a/CHANGELOG.md b/CHANGELOG.md index b9dd199..c967e60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fixes - Fix regression in Nix 2.19+ (`devour-flake produced an outpath with no outputs`) (\#35) - Evaluate OS configurations for current system only (\#38) + - Fail correctly if nixci is passed a missing flake attribute (\#44) # 0.2.0 diff --git a/Cargo.lock b/Cargo.lock index 101f9dd..4daa0fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -791,9 +791,9 @@ dependencies = [ [[package]] name = "nix_rs" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18f6606788c363ffe0251a1922aa4c3bae819e59696448eaa88a6ac3e38ee28" +checksum = "73718840161bceeaeacf69be31942bbd034cf52a1801c9cf7a54de4c0aab8c14" dependencies = [ "bytesize", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index cc7bd7f..9e5177a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,8 @@ reqwest = { version = "0.11", features = ["blocking", "json"] } try-guard = "0.2.0" clap = { version = "4.4", features = ["derive"] } urlencoding = "2.1.3" -nix_rs = { version = "0.2.3" } +nix_rs = { version = "0.3.0" } +# nix_rs = { version = "0.3", path = "../nix-browser/crates/nix_rs" } tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } tracing = "0.1.37" diff --git a/src/config.rs b/src/config.rs index 6630a59..a145db4 100644 --- a/src/config.rs +++ b/src/config.rs @@ -36,7 +36,7 @@ impl Config { let (url, attr) = url.split_attr(); let name = attr.get_name(); let nixci_url = FlakeUrl(format!("{}#nixci.{}", url.0, name)); - let cfg = nix_eval_attr_json::(&nixci_url).await?; + let cfg = nix_eval_attr_json::(&nixci_url, attr.is_none()).await?; Ok(((name, cfg), url)) } }