Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3469062e7638
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ad4a332eb70
Choose a head ref
  • 2 commits
  • 1 file changed
  • 3 contributors

Commits on Jan 2, 2020

  1. passAsFile: hash the attribute name instead of numbering sequentially 

    This makes the paths consistent without relying on ordering.

Co-authored-by: edef <edef@edef.eu>
    @puckipedia @edef1c
    puckipedia and edef1c committed Jan 2, 2020
    Copy the full SHA
    515c0a2 View commit details

  2. Merge pull request #3297 from edef1c/passasfile-hash 

    passAsFile: hash the attribute name instead of numbering sequentially
    @edolstra
    edolstra authored Jan 2, 2020
    Copy the full SHA
    3ad4a33 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/libstore/build.cc
4 changes: 2 additions & 2 deletions src/libstore/build.cc
View file
Original file line number Diff line number Diff line change
@@ -2455,12 +2455,12 @@ void DerivationGoal::initTmpDir() {
if (!parsedDrv->getStructuredAttrs()) {

StringSet passAsFile = tokenizeString<StringSet>(get(drv->env, "passAsFile").value_or(""));
int fileNr = 0;
for (auto & i : drv->env) {
if (passAsFile.find(i.first) == passAsFile.end()) {
env[i.first] = i.second;
} else {
string fn = ".attr-" + std::to_string(fileNr++);
auto hash = hashString(htSHA256, i.first);
string fn = ".attr-" + hash.to_string();
Path p = tmpDir + "/" + fn;
writeFile(p, i.second);
chownToBuilder(p);