lockFlake(): When updating a lock, respect the input's lock file (backport #13437)#13439
Merged
tomberek merged 1 commit into2.30-maintenancefrom Jul 10, 2025
Merged
Conversation
(cherry picked from commit 95437b9)
tomberek
approved these changes
Jul 10, 2025
Contributor
Author
|
This pull request has been removed from the queue for the following reason: Pull request #13439 has been dequeued. The pull request could not be merged. This could be related to an activated branch protection or ruleset rule that prevents us from merging. (details: Required status check "tests on ubuntu" is in progress.). You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
For example, if a flake has a lock for
aanda/b, and we change the flakeref fora, previously Nix would fetch the latest version ofbrather than using the lock forbfroma.Fixes #8976 and probably #6105. Updated version of #8977.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.
This is an automatic backport of pull request #13437 done by [Mergify](https://mergify.com).