wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 06:01:48 +02:00
Code Activity

Merge pull request #9197 from obsidiansystems/delete-dead-code

Browse source 
Delete dead code
This commit is contained in:
John Ericson 2023-10-20 13:32:06 -04:00 • committed by GitHub
commit 81ed1d56ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build/local-derivation-goal.hh
View file

@ -120,14 +120,6 @@ struct LocalDerivationGoal : public DerivationGoal
*/ */
OutputPathMap scratchOutputs; OutputPathMap scratchOutputs;
/**
* Path registration info from the previous round, if we're
* building multiple times. Since this contains the hash, it
* allows us to compare whether two rounds produced the same
* result.
*/
std::map<Path, ValidPathInfo> prevInfos;
uid_t sandboxUid() { return usingUserNamespace ? (!buildUser || buildUser->getUIDCount() == 1 ? 1000 : 0) : buildUser->getUID(); } uid_t sandboxUid() { return usingUserNamespace ? (!buildUser || buildUser->getUIDCount() == 1 ? 1000 : 0) : buildUser->getUID(); }
gid_t sandboxGid() { return usingUserNamespace ? (!buildUser || buildUser->getUIDCount() == 1 ? 100 : 0) : buildUser->getGID(); } gid_t sandboxGid() { return usingUserNamespace ? (!buildUser || buildUser->getUIDCount() == 1 ? 100 : 0) : buildUser->getGID(); }

8
src/libstore/path-info.hh
View file

@ -72,14 +72,6 @@ struct ValidPathInfo
*/ */
std::optional<ContentAddress> ca; std::optional<ContentAddress> ca;
bool operator == (const ValidPathInfo & i) const
{
return
path == i.path
&& narHash == i.narHash
&& references == i.references;
}
/** /**
* Return a fingerprint of the store path to be used in binary * Return a fingerprint of the store path to be used in binary
* cache signatures. It contains the store path, the base-32 * cache signatures. It contains the store path, the base-32