flake update

This commit is contained in:
Robin Appelman 2025-06-02 22:07:14 +02:00
commit fc3a93d330
6 changed files with 1362 additions and 53 deletions

1
.gitignore vendored
View file

@ -1,5 +1,4 @@
/target /target
**/*.rs.bk **/*.rs.bk
Cargo.lock
.direnv .direnv
result result

1275
Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -30,14 +30,15 @@ async fn main() -> Result<(), MainError> {
Licensed under either of Licensed under either of
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0) - Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
* MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT) https://www.apache.org/licenses/LICENSE-2.0)
- MIT license ([LICENSE-MIT](LICENSE-MIT) or
https://opensource.org/licenses/MIT)
at your option. at your option.
### Contribution ### Contribution
Unless you explicitly state otherwise, any contribution intentionally Unless you explicitly state otherwise, any contribution intentionally submitted
submitted for inclusion in the work by you, as defined in the Apache-2.0 for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
license, shall be dual licensed as above, without any additional terms or dual licensed as above, without any additional terms or conditions.
conditions.

95
flake.lock generated
View file

@ -1,56 +1,103 @@
{ {
"nodes": { "nodes": {
"flake-utils": { "crane": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1742394900,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
"owner": "numtide", "owner": "ipetkov",
"repo": "flake-utils", "repo": "crane",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "ipetkov",
"repo": "flake-utils", "repo": "crane",
"type": "github" "type": "github"
} }
}, },
"flakelight": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1748868585,
"narHash": "sha256-DrrbahOQAwvNM8l5EuGxxkVS7X5/S59zcG0N9ZWQFhk=",
"owner": "nix-community",
"repo": "flakelight",
"rev": "dfbecd12d99c1bf82906521a6a7d5b75d2aa1ca2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flakelight",
"type": "github"
}
},
"mill-scale": {
"inputs": {
"crane": "crane",
"flakelight": [
"flakelight"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1748205441,
"narHash": "sha256-W+UUBT/l1DSTZo5G43494mRNNspJ2i9jW2QELC9JuMQ=",
"ref": "refs/heads/main",
"rev": "dac3b74a89cebbeb21cc6602e4a346604adbee8b",
"revCount": 49,
"type": "git",
"url": "https://codeberg.org/icewind/mill-scale"
},
"original": {
"type": "git",
"url": "https://codeberg.org/icewind/mill-scale"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707761978, "lastModified": 1748708770,
"narHash": "sha256-izmjrbAfwwCu73I6GiVn4g7K3W7HyigKyYISj/Vw3Fs=", "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d103922e7783b5b3f8811d2325d297032c8f0d5", "rev": "a59eb7800787c926045d51b70982ae285faa2346",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "release-23.11", "ref": "nixos-25.05",
"type": "indirect" "type": "indirect"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flakelight": "flakelight",
"mill-scale": "mill-scale",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
}, },
"systems": { "rust-overlay": {
"inputs": {
"nixpkgs": [
"mill-scale",
"flakelight",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1742697269,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=",
"owner": "nix-systems", "owner": "oxalica",
"repo": "default", "repo": "rust-overlay",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "oxalica",
"repo": "default", "repo": "rust-overlay",
"type": "github" "type": "github"
} }
} }

View file

@ -1,23 +1,14 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/release-23.11"; nixpkgs.url = "nixpkgs/nixos-25.05";
flake-utils.url = "github:numtide/flake-utils"; flakelight = {
url = "github:nix-community/flakelight";
inputs.nixpkgs.follows = "nixpkgs";
}; };
mill-scale = {
outputs = { url = "git+https://codeberg.org/icewind/mill-scale";
self, inputs.flakelight.follows = "flakelight";
nixpkgs,
flake-utils,
...
}: let
inherit (flake-utils.lib) eachDefaultSystem eachSystem;
in eachDefaultSystem (system: let
pkgs = (import nixpkgs) {
inherit system;
}; };
in rec {
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [cargo rustc clippy bacon cargo-edit cargo-semver-checks pkg-config openssl];
}; };
}); outputs = {mill-scale, ...}: mill-scale ./. {};
} }

View file

@ -1,7 +1,6 @@
use thiserror::Error; use thiserror::Error;
use reqwest::Client; use reqwest::Client;
use serde::Deserialize; use serde::Deserialize;
use std::cmp::{max, min};
use std::time::SystemTime; use std::time::SystemTime;
use tokio::time::Duration; use tokio::time::Duration;
@ -137,10 +136,7 @@ impl EdgeDetector {
query, query,
start_time, start_time,
end_time, end_time,
min( ((end_time as usize - start_time as usize) / 240).clamp(2usize, 60usize),
60usize,
max(2usize, (end_time as usize - start_time as usize) / 240),
),
) )
.await? .await?
.result; .result;