nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 07:22:43 +01:00
Code Activity

Merge pull request #11167 from NixOS/repl-test-rejiggle

Browse source 
Fix repl test for `buildReadlineNoMarkdown`
This commit is contained in:
Robert Hensing 2024-07-27 00:55:57 +02:00 • committed by GitHub
commit 861bd102a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 302 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,7 @@ void LocalDerivationGoal::killSandbox(bool getStats)
buildResult.cpuSystem = stats.cpuSystem;
}
#else
abort();
unreachable();
#endif
}

2
src/libstore/unix/pathlocks.cc
View file

@ -45,7 +45,7 @@ bool lockFile(Descriptor desc, LockType lockType, bool wait)
if (lockType == ltRead) type = LOCK_SH;
else if (lockType == ltWrite) type = LOCK_EX;
else if (lockType == ltNone) type = LOCK_UN;
else abort();
else unreachable();
if (wait) {
while (flock(desc, type) != 0) {