nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests.nixpkgs-check-by-name: Intermediate UndefinedAttr error

Browse Source
This commit is contained in:
Silvan Mosberger 2023-10-19 23:48:31 +02:00
parent b688da8189
commit 4f17b9367d
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/test/nixpkgs-check-by-name/src/check_result.rs
View File

@ -6,6 +6,10 @@ use std::io;
use std::path::PathBuf;
pub enum CheckError {
UndefinedAttr {
relative_package_file: PathBuf,
package_name: String,
},
WrongCallPackage {
relative_package_file: PathBuf,
package_name: String,
@ -64,6 +68,12 @@ impl CheckError {
impl fmt::Display for CheckError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
CheckError::UndefinedAttr { relative_package_file, package_name } =>
write!(
f,
"pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}",
relative_package_file.display()
),
CheckError::WrongCallPackage { relative_package_file, package_name } =>
write!(
f,

20
pkgs/test/nixpkgs-check-by-name/src/eval.rs
View File

@ -116,7 +116,7 @@ pub fn check_values<W: io::Write>(
let relative_package_file = structure::Nixpkgs::relative_file_for_package(package_name);
let absolute_package_file = nixpkgs.path.join(&relative_package_file);
if let Some(attribute_info) = actual_files.get(package_name) {
let check_result = if let Some(attribute_info) = actual_files.get(package_name) {
let valid = match &attribute_info.variant {
AttributeVariant::AutoCalled => true,
AttributeVariant::CallPackage { path, empty_arg } => {
@ -137,7 +137,7 @@ pub fn check_values<W: io::Write>(
AttributeVariant::Other => false,
};
let check_result = if !valid {
if !valid {
CheckError::WrongCallPackage {
relative_package_file: relative_package_file.clone(),
package_name: package_name.clone(),
@ -151,15 +151,15 @@ pub fn check_values<W: io::Write>(
.into_result()
} else {
pass(())
};
write_check_result(error_writer, check_result)?;
}
} else {
error_writer.write(&format!(
"pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}",
relative_package_file.display()
))?;
continue;
}
CheckError::UndefinedAttr {
relative_package_file: relative_package_file.clone(),
package_name: package_name.clone(),
}
.into_result()
};
write_check_result(error_writer, check_result)?;
}
Ok(())
}