From f6bab626ec3cb5c8aed2c51092a438790eae377a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 26 Mar 2026 16:54:24 +0100 Subject: [PATCH] nix update --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 2 +- rust-toolchain.toml | 6 +++--- src/data/schema.rs | 1 + src/data/steam_id.rs | 4 ++-- src/pages/about.rs | 2 +- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 1a4c206..7c42556 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1774313767, + "narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "3d9df76e29656c679c744968b17fbaf28f0e923d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1742215471, - "narHash": "sha256-I/7CY1gd5R4b3rBlhcJyjCYcP+v/164g83uOT9HTfj0=", + "lastModified": 1774271954, + "narHash": "sha256-FbvMOykx7f7uEPdRVzUSABnLjqCdEp22wa0nDkuEd3s=", "owner": "nix-community", "repo": "flakelight", - "rev": "e40a1a8c6d18c761659ed88d7536310a7e604f7f", + "rev": "c90878b309508083094f465d6aa11b3963f48b9f", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1747928985, - "narHash": "sha256-OGJvoEbcclL566m9PCq+SdOQ9vJzLfVCOkww9L/uZT8=", + "lastModified": 1774538603, + "narHash": "sha256-IG0fOFNUjselW61zc/jOZU3abmt7FjcRdES9SXeHun4=", "ref": "refs/heads/main", - "rev": "742b8596357b53bf437d504a87455f46edba8be2", - "revCount": 46, + "rev": "0ef9ce3384617243e1b9e94a7057f879f621f014", + "revCount": 69, "type": "git", "url": "https://codeberg.org/icewind/mill-scale.git" }, @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1774388614, + "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.11", + "ref": "nixos-25.11", "type": "indirect" } }, @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1740277845, - "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=", + "lastModified": 1774535687, + "narHash": "sha256-dpKS/8+uB0EoI4mCrpio+xs8Xxry6ZhLLwV8VIbbfrs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f933070c29f9c1c5457447a51903f27f76ebb519", + "rev": "75900435aa883f84b038316864b3f60956681523", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c28eb5b..6d0bb3a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-24.11"; + nixpkgs.url = "nixpkgs/nixos-25.11"; flakelight = { url = "github:nix-community/flakelight"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 97f215f..4cb30e8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2024-11-18" -components = [ "rustfmt", "rust-std", "clippy", "rust-src" ] -targets = [ "riscv32imc-unknown-none-elf" ] \ No newline at end of file +channel = "nightly-2026-03-18" +components = ["rustfmt", "rust-std", "clippy", "rust-src"] +targets = ["riscv32imc-unknown-none-elf"] \ No newline at end of file diff --git a/src/data/schema.rs b/src/data/schema.rs index 54697b0..ce9f3fe 100644 --- a/src/data/schema.rs +++ b/src/data/schema.rs @@ -61,6 +61,7 @@ impl Iden for CleanMapName { #[derive(Iden)] #[iden = "ARRAY"] +#[allow(dead_code)] pub struct ArrayFunc; #[derive(Iden)] diff --git a/src/data/steam_id.rs b/src/data/steam_id.rs index a69db9a..b8fdca3 100644 --- a/src/data/steam_id.rs +++ b/src/data/steam_id.rs @@ -142,11 +142,11 @@ impl Render for UploadsLink<'_> { } impl SteamId { - pub fn uploads_link(&self) -> UploadsLink { + pub fn uploads_link<'a>(&'a self) -> UploadsLink<'a> { UploadsLink(self) } - pub fn profile_link(&self) -> ProfileLink { + pub fn profile_link<'a>(&'a self) -> ProfileLink<'a> { ProfileLink(self) } } diff --git a/src/pages/about.rs b/src/pages/about.rs index 817df0b..a298760 100644 --- a/src/pages/about.rs +++ b/src/pages/about.rs @@ -10,7 +10,7 @@ pub struct AboutPage { } impl AboutPage { - pub fn plugin_section(&self) -> PluginSection { + pub fn plugin_section<'a>(&'a self) -> PluginSection<'a> { PluginSection { key: self.key.as_ref(), }