Fix destruction of DerivationBuilder implementations#15072
Merged
Conversation
Ericson2314
approved these changes
Jan 24, 2026
296b203 to
533af39
Compare
This unsures that we call the correct virtual functions when destroying a particular
DerivationBuilder.
Usually the order of destructors is in the reverse order of inheritance:
ChrootLinuxDerivationBuilder -> ChrootDerivationBuilder -> DerivationBuilderImpl
autoDelChroot was being destroyed before the DerivationBuilderImpl::killChild was
run and it would fail to clean up the chroot directory, since there were still processes
writing to it. Note that ChrootLinuxDerivationBuilder::killSandbox was never run in
the interrupted case at all, since virtual functions in destructors do not call derived class
methods.
I could reproduce the issue with the following derivation:
let
pkgs = import <nixpkgs> { };
in
pkgs.runCommand "chroot-cleanup-race" { } ''
mkdir -p $out
for i in $(seq 1 200); do
(
mkfifo $out/fifo$i
cat $out/fifo$i > /dev/null &
while true; do
: > $out/file$i
done
) &
done
sleep 0.05
echo done > $out/main
''
While interrupting it manually when it would hang.
Wrapping the unique pointer in a custom deleter function we can run all
of the necessary clean up code consistently and calling the right virtual
functions. Ideally we'd have a lint that bans the usage of virtual functions
in destructors completely.
533af39 to
b752c5c
Compare
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin 2.33-maintenance
git worktree add -d .worktree/backport-15072-to-2.33-maintenance origin/2.33-maintenance
cd .worktree/backport-15072-to-2.33-maintenance
git switch --create backport-15072-to-2.33-maintenance
git cherry-pick -x b752c5cb64c2675dc51aef6eb6b97d16a2a477e4 |
philiptaron
added a commit
to philiptaron/nixpkgs
that referenced
this pull request
Feb 7, 2026
## Bug fixes - Fix destruction of DerivationBuilder implementations (NixOS/nix#15072) - Don't report cancelled goals as failures (NixOS/nix#14972) - Fix `linux` build on fresh `glibc` and `gcc` (NixOS/nix#15011) ## S3 binary cache improvements - Add AWS SSO support for S3 authentication (NixOS/nix#14645) - Respect `AWS_PROFILE` environment variable (NixOS/nix#14645) - Add STS support for default profile (NixOS/nix#14645) - Skip `Accept-Encoding` header for S3 SigV4 requests (NixOS/nix#15048) - Restart source before upload retries (NixOS/nix#15047) - Route AWS CRT logs through Nix logger (NixOS/nix#15059) The glibc 2.42 build fix patch is dropped as it is now included upstream. https://github.com/NixOS/nix/releases/tag/2.33.2
13 tasks
brittonr
pushed a commit
to brittonr/nix
that referenced
this pull request
Apr 1, 2026
…ation-builder Fix destruction of DerivationBuilder implementations
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
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
This unsures that we call the correct virtual functions when destroying a particular
DerivationBuilder.
Usually the order of destructors is in the reverse order of inheritance:
ChrootLinuxDerivationBuilder->ChrootDerivationBuilder->DerivationBuilderImplautoDelChrootwas being destroyed before theDerivationBuilderImpl::killChildwas run and it would fail to clean up the chroot directory, since there were still processes writing to it. Note thatChrootLinuxDerivationBuilder::killSandboxwas never run in the interrupted case at all, since virtual functions in destructors do not call derived class methods.I could reproduce the issue with the following derivation:
While interrupting it manually when it would hang.
Wrapping the unique pointer in a custom deleter function we can run all of the necessary clean up code consistently and calling the right virtual functions. Ideally we'd have a lint that bans the usage of virtual functions in destructors completely.
Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.