wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00
Code Activity

Fix Darwin test failure in repl.sh

Browse source 
Fixes

  error:
         … while processing sandbox path '/private/tmp/nix-shell.0MDgyx/nix-test/ca/repl/store/nix/var/nix/builds/nix-build-simple.drv-65916-3910734210' (/private/tmp/nix-shell.0MDgyx/nix-test/ca/repl/store)

         error: 'nix' is too short to be a valid store path

which happened because we were now putting the build directory
underneath the store directory.
This commit is contained in:
Eelco Dolstra 2025-06-19 13:26:10 +02:00 • committed by Jörg Thalheim
parent 2e2fe4cb07
commit 37685b1c9c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -922,7 +922,7 @@ DerivationBuilderImpl::PathsInChroot DerivationBuilderImpl::getPathsInSandbox()
store.computeFSClosure(store.toStorePath(i.second.source).first, closure); store.computeFSClosure(store.toStorePath(i.second.source).first, closure);
} catch (InvalidPath & e) { } catch (InvalidPath & e) {
} catch (Error & e) { } catch (Error & e) {
e.addTrace({}, "while processing 'sandbox-paths'"); e.addTrace({}, "while processing sandbox path '%s'", i.second.source);
throw; throw;
} }
for (auto & i : closure) { for (auto & i : closure) {

2
tests/functional/repl.sh
View file

@ -67,7 +67,7 @@ testRepl () {
# Simple test, try building a drv # Simple test, try building a drv
testRepl testRepl
# Same thing (kind-of), but with a remote store. # Same thing (kind-of), but with a remote store.
testRepl --store "$TEST_ROOT/store?real=$NIX_STORE_DIR" testRepl --store "$TEST_ROOT/other-root?real=$NIX_STORE_DIR"
# Remove ANSI escape sequences. They can prevent grep from finding a match. # Remove ANSI escape sequences. They can prevent grep from finding a match.
stripColors () { stripColors () {