flake updates

This commit is contained in:
Robin Appelman 2025-08-07 17:02:08 +02:00
commit b1060bbb73
4 changed files with 24 additions and 24 deletions

42
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1742394900, "lastModified": 1751562746,
"narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748263617, "lastModified": 1754312187,
"narHash": "sha256-O1xypYFWzYlfiyO3fUZuzRhYac5DGptP+ZhocY9L5tQ=", "narHash": "sha256-rKR+JuAX+sOhaW9glu2DIJlV1YHU7X04Wjt/hYGGfzs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flakelight", "repo": "flakelight",
"rev": "65c783ba2b85910df5a053cb1451e9eb13794c12", "rev": "5286275afda277d16d7bda8c6ad4c27649eecf95",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,26 +44,26 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1747926214, "lastModified": 1752438127,
"narHash": "sha256-e/7klyoQpe9wsYeQIUfm/9Yqa78et24L+nSpsCz937k=", "narHash": "sha256-1NKLbztqg0/sYUhZgxus+WJU+jZThkV+pga/kqjB3/A=",
"owner": "icewind1991", "ref": "refs/heads/main",
"repo": "mill-scale", "rev": "31877680aa6d391e59a598d35081e24b4316ab9a",
"rev": "394979573123e5d4762d29cc78b5e11b3d35cc6b", "revCount": 60,
"type": "github" "type": "git",
"url": "https://codeberg.org/icewind/mill-scale.git"
}, },
"original": { "original": {
"owner": "icewind1991", "type": "git",
"repo": "mill-scale", "url": "https://codeberg.org/icewind/mill-scale.git"
"type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748437600, "lastModified": 1754292888,
"narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742697269, "lastModified": 1752374969,
"narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", "narHash": "sha256-Ky3ynEkJXih7mvWyt9DWoiSiZGqPeHLU1tlBU4b0mcc=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", "rev": "75fb000638e6d0f57cb1e8b7a4550cbdd8c76f1d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,7 +6,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
mill-scale = { mill-scale = {
url = "github:icewind1991/mill-scale"; url = "git+https://codeberg.org/icewind/mill-scale.git";
inputs.flakelight.follows = "flakelight"; inputs.flakelight.follows = "flakelight";
}; };
}; };

View file

@ -278,7 +278,7 @@ fn parse_db_options(parsed: &Value) -> Result<Database> {
.ok_or(DbError::NoDataDirectory)?; .ok_or(DbError::NoDataDirectory)?;
let db_name = parsed["dbname"].as_str().unwrap_or("owncloud"); let db_name = parsed["dbname"].as_str().unwrap_or("owncloud");
Ok(Database::Sqlite { Ok(Database::Sqlite {
database: format!("{}/{}.db", data_dir, db_name).into(), database: format!("{data_dir}/{db_name}.db").into(),
}) })
} }
Some(ty) => Err(Error::InvalidDb(DbError::Unsupported(ty.into()))), Some(ty) => Err(Error::InvalidDb(DbError::Unsupported(ty.into()))),

View file

@ -13,7 +13,7 @@ use std::str::FromStr;
#[cfg(test)] #[cfg(test)]
#[track_caller] #[track_caller]
fn assert_debug_equal<T: Debug>(a: T, b: T) { fn assert_debug_equal<T: Debug>(a: T, b: T) {
assert_eq!(format!("{:?}", a), format!("{:?}", b),); assert_eq!(format!("{a:?}"), format!("{b:?}"),);
} }
#[cfg(test)] #[cfg(test)]