summaryrefslogtreecommitdiffstats
path: root/pkgs/by-name/ro/rollup/src/config.rs
diff options
context:
space:
mode:
authorSoispha Peetz <soispha@b-peetz.de>2026-11-14 18:38:25 +0100
committerSoispha Peetz <soispha@b-peetz.de>2026-11-14 18:38:58 +0100
commit2244b1daa5f1a2f8f84770947b1664c0925b61c5 (patch)
tree895289f8ab4178cafbfaab37c8063ee4c9b476c4 /pkgs/by-name/ro/rollup/src/config.rs
parentmodules/dconf: Make possible to disable (diff)
downloadnixos-config-2244b1daa5f1a2f8f84770947b1664c0925b61c5.zip
pkgs/rollup: Allow multiple owners in rollup config drop-ins
Diffstat (limited to 'pkgs/by-name/ro/rollup/src/config.rs')
-rw-r--r--pkgs/by-name/ro/rollup/src/config.rs36
1 files changed, 32 insertions, 4 deletions
diff --git a/pkgs/by-name/ro/rollup/src/config.rs b/pkgs/by-name/ro/rollup/src/config.rs
index 64e0b792..66bd2366 100644
--- a/pkgs/by-name/ro/rollup/src/config.rs
+++ b/pkgs/by-name/ro/rollup/src/config.rs
@@ -36,7 +36,7 @@ pub(crate) struct Owner {
#[derive(Serialize, Deserialize, Debug)]
pub(crate) struct DropInConfig {
- pub(crate) owner: String,
+ pub(crate) owners: Vec<String>,
}
pub(crate) fn load(root: &PathBuf) -> Result<MainConfig> {
@@ -64,13 +64,41 @@ fn collect_drop_ins(path: &PathBuf) -> Result<Vec<(PathBuf, DropInConfig)>> {
if ft.is_dir() {
output.extend(collect_drop_ins(&entry.path())?);
} else if ft.is_file() && entry.file_name() == OsStr::new(DROP_IN_NAME) {
- let drop_in: DropInConfig = {
+ let drop_in: toml::Value = {
let content = fs::read_to_string(entry.path())?;
toml::from_str(&content)?
};
+
+ let drop_in_config = DropInConfig {
+ owners: {
+ let Some(owner) = drop_in.get("owner") else {
+ bail!("Drop in config without `owner` field")
+ };
+ if owner.is_str() {
+ vec![owner.as_str().expect("We checked").to_owned()]
+ } else if owner.is_array() {
+ let mut output = vec![];
+ for v in owner.as_array().expect("We checked") {
+ if let Some(v) = v.as_str() {
+ output.push(v.to_owned())
+ } else {
+ bail!("Owner value in arry not string: {}", v);
+ }
+ }
+ output
+ } else {
+ bail!("Owner value in drop in config not string or array")
+ }
+ },
+ };
+
output.push((
- entry.path().parent().expect("All drop-ins have a parent").to_owned(),
- drop_in,
+ entry
+ .path()
+ .parent()
+ .expect("All drop-ins have a parent")
+ .to_owned(),
+ drop_in_config,
));
}
}