nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00
Code Activity

Merge pull request #14003 from NixOS/mergify/bp/2.30-maintenance/pr-13839

Browse source 
don't include derivation name in temporary build directories (backport #13839)
This commit is contained in:
Jörg Thalheim 2025-09-16 13:06:02 +02:00 • committed by GitHub
commit c6c88d3385
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/manual/rl-next/shorter-build-dir-names.md Normal file
View file

@ -0,0 +1,6 @@
---
synopsis: "Temporary build directories no longer include derivation names"
prs: [13839]
---
Temporary build directories created during derivation builds no longer include the derivation name in their path to avoid build failures when the derivation name is too long. This change ensures predictable prefix lengths for build directories under `/nix/var/nix/builds`.

2
src/libstore/unix/build/derivation-builder.cc
View file

@ -736,7 +736,7 @@ void DerivationBuilderImpl::startBuilder()
/* Create a temporary directory where the build will take /* Create a temporary directory where the build will take
place. */ place. */
topTmpDir = createTempDir(buildDir, "nix-build-" + std::string(drvPath.name()), 0700); topTmpDir = createTempDir(buildDir, "nix", 0700);
setBuildTmpDir(); setBuildTmpDir();
assert(!tmpDir.empty()); assert(!tmpDir.empty());

6
tests/functional/check.sh
View file

@ -52,10 +52,10 @@ test_custom_build_dir() {
nix-build check.nix -A failed --argstr checkBuildId "$checkBuildId" \ nix-build check.nix -A failed --argstr checkBuildId "$checkBuildId" \
--no-out-link --keep-failed --option build-dir "$TEST_ROOT/custom-build-dir" 2> "$TEST_ROOT/log" || status=$? --no-out-link --keep-failed --option build-dir "$TEST_ROOT/custom-build-dir" 2> "$TEST_ROOT/log" || status=$?
[ "$status" = "100" ] [ "$status" = "100" ]
[[ 1 == "$(count "$customBuildDir/nix-build-"*)" ]] [[ 1 == "$(count "$customBuildDir/nix-"*)" ]]
local buildDir=("$customBuildDir/nix-build-"*) local buildDir=("$customBuildDir/nix-"*)
if [[ "${#buildDir[@]}" -ne 1 ]]; then if [[ "${#buildDir[@]}" -ne 1 ]]; then
echo "expected one nix-build-* directory, got: ${buildDir[*]}" >&2 echo "expected one nix-* directory, got: ${buildDir[*]}" >&2
exit 1 exit 1
fi fi
if [[ -e ${buildDir[*]}/build ]]; then if [[ -e ${buildDir[*]}/build ]]; then

8
tests/nixos/user-sandboxing/default.nix
View file

@ -104,8 +104,8 @@ in
# Wait for the build to be ready # Wait for the build to be ready
# This is OK because it runs as root, so we can access everything # This is OK because it runs as root, so we can access everything
machine.wait_until_succeeds("stat /nix/var/nix/builds/nix-build-open-build-dir.drv-*/build/syncPoint") machine.wait_until_succeeds("stat /nix/var/nix/builds/nix-*/build/syncPoint")
dir = machine.succeed("ls -d /nix/var/nix/builds/nix-build-open-build-dir.drv-*").strip() dir = machine.succeed("ls -d /nix/var/nix/builds/nix-*").strip()
# But Alice shouldn't be able to access the build directory # But Alice shouldn't be able to access the build directory
machine.fail(f"su alice -c 'ls {dir}/build'") machine.fail(f"su alice -c 'ls {dir}/build'")
@ -125,8 +125,8 @@ in
args = [ (builtins.storePath "${create-hello-world}") ]; args = [ (builtins.storePath "${create-hello-world}") ];
}' >&2 & }' >&2 &
""".strip()) """.strip())
machine.wait_until_succeeds("stat /nix/var/nix/builds/nix-build-innocent.drv-*/build/syncPoint") machine.wait_until_succeeds("stat /nix/var/nix/builds/nix-*/build/syncPoint")
dir = machine.succeed("ls -d /nix/var/nix/builds/nix-build-innocent.drv-*").strip() dir = machine.succeed("ls -d /nix/var/nix/builds/nix-*").strip()
# The build ran as `nixbld1` (which is the only build user on the # The build ran as `nixbld1` (which is the only build user on the
# machine), but a process running as `nixbld1` outside the sandbox # machine), but a process running as `nixbld1` outside the sandbox