From ee7f4646da266f7b6407cda35472b9f42d853213 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Wed, 26 Nov 2025 11:13:51 -0600 Subject: [PATCH] maintaining.md: add note about flake.nix / lock update Signed-off-by: Austin Horstman --- MAINTAINING.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/MAINTAINING.md b/MAINTAINING.md index 41adbc41d..edf3d7860 100644 --- a/MAINTAINING.md +++ b/MAINTAINING.md @@ -121,6 +121,22 @@ Reference commits: - Change `isReleaseBranch` from `false` to `true` - Do NOT change the `release` field (it's already correct from Step 1) +2. **flake.nix** + - Update the nixpkgs input to track the corresponding stable branch + - Example: For `release-25.11`, change from: + ```nix + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + ``` + to: + ```nix + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + ``` + - Run `nix flake update` to update flake.lock to the stable branch + - Commit the flake.nix and flake.lock changes + +**Note**: The release branch should track the stable NixOS release channel +(e.g., `nixos-25.11`), while master continues to track `nixos-unstable`. + #### Step 3.5: On master - Update CI for the New Release Branch **When**: After marking the release branch as a release branch (Step 3)