robin/galton
1
0
Fork 0
mirror of https://codeberg.org/icewind/galton.git synced 2026-06-03 10:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

flake update

Browse source
This commit is contained in:
Robin Appelman 2025-12-20 14:48:11 +01:00
commit 9146f9deeb
4 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1748970125, "lastModified": 1763938834,
"narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750683087, "lastModified": 1765803403,
"narHash": "sha256-CkmobghX9K9soC4DoorFo/vlWXxpf8xuZyoCsOnWzqM=", "narHash": "sha256-4dB2fDOKJZz3gnoD+VDGI+c4Ztud9rC5kqVG/XyhNvA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flakelight", "repo": "flakelight",
"rev": "aa93e0e1ecdccc70c7a185f60c562effbfe3c8d9", "rev": "c10ecde0869fbcb4c99e298e86756c207feff432",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +44,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1750254239, "lastModified": 1764619631,
"narHash": "sha256-RRhboiUiw4o4hPhxTTnUcd2+8yOLdt6hOTDraMPE/rg=", "narHash": "sha256-WojMP5S9qLmOLecEQ+7+yc33Ly1ydoRsODNG6hlLqiQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b7201d4a2220de413e6426c405b69839f6130d1c", "rev": "0fae557bf52d8493840aca52d433c473ecc305ef",
"revCount": 53, "revCount": 67,
"type": "git", "type": "git",
"url": "https://codeberg.org/icewind/mill-scale" "url": "https://codeberg.org/icewind/mill-scale"
}, },
@ -59,16 +59,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750622754, "lastModified": 1765838191,
"narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"type": "indirect" "type": "indirect"
} }
}, },
@ -88,11 +88,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750214276, "lastModified": 1764557621,
"narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", "narHash": "sha256-kX5PoY8hQZ80+amMQgOO9t8Tc1JZ70gYRnzaVD4AA+o=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", "rev": "93316876c2229460a5d6f5f052766cc4cef538ce",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-25.05"; nixpkgs.url = "nixpkgs/nixos-25.11";
flakelight = { flakelight = {
url = "github:nix-community/flakelight"; url = "github:nix-community/flakelight";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

2
src/matchers/filemeta.rs
View file

@ -69,7 +69,7 @@ struct RegexMatchExtractor {
} }
impl Extractor for RegexMatchExtractor { impl Extractor for RegexMatchExtractor {
fn extract(&self, field: &str) -> Option<Result<Cow<str>, Box<dyn Error>>> { fn extract<'a>(&'a self, field: &str) -> Option<Result<Cow<'a, str>, Box<dyn Error>>> {
let value = self let value = self
.matches .matches
.iter() .iter()

8
src/matchers/mod.rs
View file

@ -3,17 +3,9 @@ use crate::file::FileInfo;
use regex::Regex; use regex::Regex;
use std::error::Error; use std::error::Error;
use std::fmt::Debug; use std::fmt::Debug;
use thiserror::Error;
mod filemeta; mod filemeta;
#[derive(Debug, Error)]
#[error("Malformed match rule '{input}': {error}")]
pub struct MatcherParseError {
input: String,
error: Box<dyn Error>,
}
fn map_result<T: Matcher + 'static, E: Error + 'static>( fn map_result<T: Matcher + 'static, E: Error + 'static>(
res: Result<T, E>, res: Result<T, E>,
) -> Result<Box<dyn Matcher>, Box<dyn Error>> { ) -> Result<Box<dyn Matcher>, Box<dyn Error>> {