From b4435afdb545eef4fad2193f9e3e318d6eb686f9 Mon Sep 17 00:00:00 2001 From: amackillop Date: Mon, 10 Aug 2026 20:36:14 -0700 Subject: [PATCH] Align nixpkgs and rustc with the kitaebot fleet Part of pinning every repo the kitaebot fleet builds to one nixpkgs rev and one stable rustc so devshell closures share store paths in the bot VM. nixpkgs-unstable was the odd channel out; nixos-26.05 is what the rest of the fleet rides. The toolchain moves 1.97.0 to 1.97.1, the version the fenix-stable repos resolve, so the fleet shares one stable toolchain in the store. --- flake.lock | 20 ++++++++++---------- flake.nix | 4 ++-- rust-toolchain.toml | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index b9d9772..4baf1d7 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1785314864, - "narHash": "sha256-imz9J5iMNersDeQ1ymenFg35N6C2R3MCaGg2i0XCIrE=", + "lastModified": 1786348189, + "narHash": "sha256-tnTpFky6/GeXVMBO+hLJK2jWS4J8TYloL+rqRME9gAk=", "owner": "nix-community", "repo": "fenix", - "rev": "594418b2c9ea0731bee6988236ef5bfd97e81dca", + "rev": "a0b1aef63d7e9c5568958e0d90f6fe48f0f4a7a2", "type": "github" }, "original": { @@ -56,16 +56,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779694939, - "narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=", + "lastModified": 1786313170, + "narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9d8b65950353691ab56561e7c73d2e1063d810b", + "rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -81,11 +81,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1785261141, - "narHash": "sha256-sA+DHPejWD68mLA7gtTiHGd5T41F6W+NKf0g+ibFCW4=", + "lastModified": 1786285255, + "narHash": "sha256-zJukKxGKLxcO7E6+P49Qe6XaSbbyGG44kFvQYLWaD3M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "bec66814323579659ffd77c909b3d963af118ece", + "rev": "57411b3a0fb0181ed5965f6541d5ed39a9d79d4c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6070a90..8eb988e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Lightning JS"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; crane.url = "github:ipetkov/crane"; flake-utils.url = "github:numtide/flake-utils"; @@ -34,7 +34,7 @@ # channel (build once with lib.fakeSha256 to learn the new one). rustToolchain = fenixPkgs.fromToolchainFile { file = ./rust-toolchain.toml; - sha256 = "sha256-OATSZm98Es5kIFuqaba+UvkQtFsVgJEBMmS+t6od5/U="; + sha256 = "sha256-A1abGIbOtcBSdrUMhDGrER3pRM1hQP4fp9gh3Y4PKc8="; }; craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 903eaf9..28475af 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -7,5 +7,5 @@ # directory override; without that they would silently build under this # toolchain with no cross-targets installed. [toolchain] -channel = "1.97.0" +channel = "1.97.1" components = ["clippy", "rustfmt", "rust-src", "rust-analyzer"]