From 07f62e0d65d1bf7466153d551eef01ca41ba9fac Mon Sep 17 00:00:00 2001 From: amackillop Date: Mon, 10 Aug 2026 21:52:09 -0700 Subject: [PATCH] Align nixpkgs on the nixos-26.05 channel branch Part of pinning every repo the kitaebot fleet builds to one nixpkgs rev so devshell closures share store paths in the bot VM. The old input pinned the 25.11 release tag, which never moves and so never picks up channel backports; nixos-26.05 is the maintained release branch. The fenix bump moves the stable toolchain to rustc 1.97.1, the same version the other fenix-stable repos now lock. 1.97's clippy grew unnecessary_sort_by, which fired on the invoices sort; switched to sort_by_key per its suggestion. --- flake.lock | 24 ++++++++++++------------ flake.nix | 2 +- src/daemon/api/invoices.rs | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index fae784c..224abba 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1773732206, - "narHash": "sha256-HKibxaUXyWd4Hs+ZUnwo6XslvaFqFqJh66uL9tphU4Q=", + "lastModified": 1786348189, + "narHash": "sha256-tnTpFky6/GeXVMBO+hLJK2jWS4J8TYloL+rqRME9gAk=", "owner": "nix-community", "repo": "fenix", - "rev": "0aa13c1b54063a8d8679b28a5cd357ba98f4a56b", + "rev": "a0b1aef63d7e9c5568958e0d90f6fe48f0f4a7a2", "type": "github" }, "original": { @@ -56,16 +56,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764521362, - "narHash": "sha256-M101xMtWdF1eSD0xhiR8nG8CXRlHmv6V+VoY65Smwf4=", - "owner": "nixos", + "lastModified": 1786313170, + "narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "871b9fd269ff6246794583ce4ee1031e1da71895", + "rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d", "type": "github" }, "original": { - "owner": "nixos", - "ref": "25.11", + "owner": "NixOS", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -99,11 +99,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1773697963, - "narHash": "sha256-xdKI77It9PM6eNrCcDZsnP4SKulZwk8VkDgBRVMnCb8=", + "lastModified": 1786285255, + "narHash": "sha256-zJukKxGKLxcO7E6+P49Qe6XaSbbyGG44kFvQYLWaD3M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2993637174252ff60a582fd1f55b9ab52c39db6d", + "rev": "57411b3a0fb0181ed5965f6541d5ed39a9d79d4c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d950d22..aab20bd 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "MDK Server"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; flake-utils.url = "github:numtide/flake-utils"; fenix = { url = "github:nix-community/fenix"; diff --git a/src/daemon/api/invoices.rs b/src/daemon/api/invoices.rs index d5b84c6..7b4f0a6 100644 --- a/src/daemon/api/invoices.rs +++ b/src/daemon/api/invoices.rs @@ -221,7 +221,7 @@ pub async fn handle_list_outgoing_payments( } // Newest first. - payments.sort_by(|a, b| b.created_at.cmp(&a.created_at)); + payments.sort_by_key(|p| std::cmp::Reverse(p.created_at)); let page = payments.into_iter().skip(offset).take(limit).collect(); Ok(Json(page))