Skip to content

[Backport 2.32-maintenance] Fix Non-virtual interface pattern for RestrictedStore::addDependency#14730

Merged
internal-nix-ci[bot] merged 1 commit into2.32-maintenancefrom
backport-14729-to-2.32-maintenance
Dec 7, 2025
Merged

[Backport 2.32-maintenance] Fix Non-virtual interface pattern for RestrictedStore::addDependency#14730
internal-nix-ci[bot] merged 1 commit into2.32-maintenancefrom
backport-14729-to-2.32-maintenance

Conversation

@internal-nix-ci
Copy link

Automatic backport to 2.32-maintenance, triggered by a label in #14729.

I didn't do things quite right in 496e43e:

- Forgot to remove the now-redundant `isAllowed` check.

- Called the non-virtual, not the superclass's impl, in
  `addDependencyPrep`, causing bad recursion / UB.

Doing this fixes a crash I encountered with manual testing an Nix Ninja
--- hopefully we will get Nix Ninja or similar in a NixOS test longer
term to defend against this thing happening again.

(cherry picked from commit 4652345)
@internal-nix-ci internal-nix-ci bot enabled auto-merge December 7, 2025 18:11
@internal-nix-ci internal-nix-ci bot merged commit 7060505 into 2.32-maintenance Dec 7, 2025
19 checks passed
@internal-nix-ci internal-nix-ci bot deleted the backport-14729-to-2.32-maintenance branch December 7, 2025 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant