Skip to content

lockFlake(): Allow registry lookups for overridden inputs (backport #13284)#13329

Merged
Mic92 merged 1 commit into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-13284
Jun 11, 2025
Merged

lockFlake(): Allow registry lookups for overridden inputs (backport #13284)#13329
Mic92 merged 1 commit into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-13284

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 6, 2025

Motivation

Similar to installables and --override-flake, it makes sense to allow local registry lookups for inputs passed by --override-input

Context

Fixes #13144

This should be backported to 2.28, as it currently affects all users by default on NixOS 25.05


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

@mergify mergify bot added automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts merge-queue labels Jun 6, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 6, 2025

Cherry-pick of d0a2323 has failed:

On branch mergify/bp/2.28-maintenance/pr-13284
Your branch is up to date with 'origin/2.28-maintenance'.

You are currently cherry-picking commit d0a232382.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/libflake/flake.cc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested a review from edolstra as a code owner June 6, 2025 08:12
@mergify mergify bot added merge-queue conflicts automatic backport This PR is a backport produced by automation (does not trigger backporting) labels Jun 6, 2025
Fixes #13144

(cherry picked from commit d0a2323)

Co-authored-by: bryango <bryango@users.noreply.github.com>
@Mic92 Mic92 force-pushed the mergify/bp/2.28-maintenance/pr-13284 branch from 8111622 to 6f4c2a0 Compare June 11, 2025 04:53
@Mic92 Mic92 enabled auto-merge June 11, 2025 04:53
@Mic92 Mic92 merged commit aee067f into 2.28-maintenance Jun 11, 2025
23 of 26 checks passed
@Mic92 Mic92 deleted the mergify/bp/2.28-maintenance/pr-13284 branch June 11, 2025 05:25
@nixos-discourse
Copy link
Copy Markdown

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/how-to-use-local-nixpkgs-from-registry-when-evaluating-a-flake/65598/6

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.

4 participants