Skip to content

Actually ignore system/user registries during locking (2nd attempt) (backport #13082)#13090

Merged
edolstra merged 2 commits into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-13082
Apr 25, 2025
Merged

Actually ignore system/user registries during locking (2nd attempt) (backport #13082)#13090
edolstra merged 2 commits into2.28-maintenancefrom
mergify/bp/2.28-maintenance/pr-13082

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 25, 2025

Motivation

Makes #12068 actually work. All registries are used for resolving top-level flakerefs, but only the global and flag registries are used for resolving flake inputs.

Fixes #13050.

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 #13082 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 labels Apr 25, 2025
@mergify mergify bot requested a review from edolstra as a code owner April 25, 2025 09:20
@mergify mergify bot added the merge-queue label Apr 25, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 25, 2025

Cherry-pick of 68de26d has failed:

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

You are currently cherry-picking commit 68de26d38.
  (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)

Changes to be committed:
	modified:   src/libcmd/installables.cc
	modified:   src/libexpr/primops/fetchTree.cc
	modified:   src/libfetchers/include/nix/fetchers/registry.hh
	modified:   src/libfetchers/registry.cc
	modified:   src/libflake/include/nix/flake/flake.hh
	modified:   src/libflake/include/nix/flake/flakeref.hh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/libfetchers/include/nix/fetchers/input-cache.hh
	deleted by us:   src/libfetchers/input-cache.cc
	both modified:   src/libflake/flake.cc
	both modified:   src/libflake/flakeref.cc
	both modified:   tests/functional/flakes/flakes.sh

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

@github-actions github-actions bot added with-tests Issues related to testing. PRs with tests have some priority fetching Networking with the outside (non-Nix) world, input locking labels Apr 25, 2025
@edolstra edolstra force-pushed the mergify/bp/2.28-maintenance/pr-13082 branch from 52a61d5 to 709f059 Compare April 25, 2025 11:33
@edolstra edolstra enabled auto-merge April 25, 2025 11:34
@edolstra edolstra mentioned this pull request Apr 25, 2025
Merged
@edolstra edolstra merged commit e20b0d7 into 2.28-maintenance Apr 25, 2025
25 checks passed
@edolstra edolstra deleted the mergify/bp/2.28-maintenance/pr-13082 branch April 25, 2025 12:13
@MichailiK MichailiK mentioned this pull request Apr 28, 2025
Closed
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

Assignees

No one assigned

Labels

automatic backport This PR is a backport produced by automation (does not trigger backporting) conflicts fetching Networking with the outside (non-Nix) world, input locking merge-queue with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@edolstra @Mic92