From fc31afda7a672d7fa96880b44ff0dfe62cb9e784 Mon Sep 17 00:00:00 2001 From: amackillop Date: Mon, 10 Aug 2026 20:36:01 -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 1.90.0 toolchain window (clippy >= 1.87 for check-lint's lint names, < 1.92 for assertions_on_constants) is untouched; only the fenix rev moves, and toolchainOf pins the version by sha256. --- flake.lock | 24 ++++++++++++------------ flake.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 832c92f6e26..fec6727ceba 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1780999471, - "narHash": "sha256-rY4yNlSzDY3OoYBdgjwlpVKWY/oUeOb65709i/tJbns=", + "lastModified": 1786348189, + "narHash": "sha256-tnTpFky6/GeXVMBO+hLJK2jWS4J8TYloL+rqRME9gAk=", "owner": "nix-community", "repo": "fenix", - "rev": "db976d430cbb6b0d6b300b4e22cbb28462841af2", + "rev": "a0b1aef63d7e9c5568958e0d90f6fe48f0f4a7a2", "type": "github" }, "original": { @@ -41,16 +41,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" } @@ -65,11 +65,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1780924205, - "narHash": "sha256-5s6nPSNU1Mo/Qy90XxCTNj6/rB70zgX8VqleTdLoESA=", + "lastModified": 1786285255, + "narHash": "sha256-zJukKxGKLxcO7E6+P49Qe6XaSbbyGG44kFvQYLWaD3M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "4fde9dd9822df453dc6f20149b8e375efbbe66c0", + "rev": "57411b3a0fb0181ed5965f6541d5ed39a9d79d4c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0f7a38e46cb..f2b3835a1af 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { # Nixpkgs channel. New channels are released every 6 months. # See: https://github.com/NixOS/nixpkgs/tags - nixpkgs.url = "github:nixos/nixpkgs/25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; # This makes it easy for the flake to be multi-platform. # See: https://github.com/numtide/flake-utils