Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lockFlake(): When refetching a locked flake, use the locked ref (backport #12458) #12459

Merged
merged 2 commits into from
Feb 12, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025

Motivation

Otherwise we may accidentally update a lock when we shouldn't.

Fixes #12445. This was broken in b2be6fe.

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 #12458 done by [Mergify](https://mergify.com).

Otherwise we may accidentally update a lock when we shouldn't.

Fixes #12445.

(cherry picked from commit 5c552b6)

# Conflicts:
#	src/libflake/flake/flake.cc
@mergify mergify bot requested a review from edolstra as a code owner February 12, 2025 15:47
@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Feb 12, 2025

This comment was marked as resolved.

@mergify mergify bot merged commit b3e9204 into 2.26-maintenance Feb 12, 2025
23 checks passed
@mergify mergify bot deleted the mergify/bp/2.26-maintenance/pr-12458 branch February 12, 2025 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant