Comparing changes
Open a pull request
base repository: NixOS/nix
base: d5ecb8d3cd8c
head repository: NixOS/nix
compare: a39798b64ca4
- 15 commits
- 10 files changed
- 5 contributors
Commits on Jul 7, 2020
-
nix auto-gc: use fragment size
(cherry picked from commit e2fc575)
Commits on Jul 8, 2020
-
Merge pull request #3790 from basvandijk/2.3-gc-fix
Cherry-pick "Use fragment size for autoGC capacity calculation" on 2.3
-
Commits on Jul 24, 2020
-
createUnixDomainSocket(): Fix off-by-one error in copying the socket …
…path Reported by Kane York. (cherry picked from commit 2292814)
Commits on Aug 13, 2020
-
-
Merge pull request #3926 from nh2/2.3-issue-3906-gc-build-errors-back…
…port repl.cc: Check for HAVE_BOEHMGC
Commits on Sep 2, 2020
-
never use /var/folders for TMPDIR on darwin
This doesn't just cause problems for nix-store --serve but also results in certain build failures. Builds that use unix domain sockets in their tests often fail because the /var/folders prefix already consumes more than half of the maximum length of socket paths. struct sockaddr_un { sa_family_t sun_family; /* AF_UNIX */ char sun_path[108]; /* Pathname */ }; (cherry picked from commit 4d9db42)
-
Merge pull request #3984 from hercules-ci/backport-darwin-tmp-dir-3488
never use /var/folders for TMPDIR on darwin (2.3 backport)
Commits on Oct 7, 2020
-
Prevent a deadlock when user namespace setup fails
Observed on Centos 7 when user namespaces are disabled: DerivationGoal::startBuilder() throws an exception, ~DerivationGoal() waits for the child process to exit, but the child process hangs forever in drainFD(userNamespaceSync.readSide.get()) in DerivationGoal::runChild(). Not sure why the SIGKILL doesn't get through. Issue #4092. (cherry picked from commit d761485)
Commits on Oct 20, 2020
-
-
fix xpath and conditional bugs; xpath -> xmllint
- xpath -> xmllint: xpath's cli interface changed in Big Sur rather than add conditional logic for picking the correct syntax for xpath, I'm changing to xmllint --xpath, which appears to be consistent across versions I've tested... - /plist/dict/key[text()='Writable']/following-sibling::true[1] doesn't do quite what's expected. It was written to try to select a <true /> node paired with the Writable key, but it will also select the *next* <true /> node that appears even if it was paired with another key. - I think there's also a logic bug in the conditionals here. I'm not sure anyone ever actuall saw it, thanks to the xpath bug, though. With the xpath fix, this conditional passes if /nix does not exist, / IS writable, and the version is Catalina+. I think it meant to test for /nix does not exist, / is NOT writable, and the version is Catalina+. I reworked this lightly to make it a little clearer at the code level. (cherry picked from commit 1f02b65) Signed-off-by: Domen Kožar <domen@dev.si>
-
replace xpath with xmllint --xpath; simplify
As mentioned in previous commit, Big Sur changes the syntax for the xpath command slightly. In the process of testing out replacements for these, I noticed a few small simplification wins. (cherry picked from commit e736f8f) Signed-off-by: Domen Kožar <domen@dev.si>
-
Commits on Oct 21, 2020
-
Fix the nix-daemon Mac OS SSL CA cert
Mac OS multi-user installations are currently broken because all requests made by nix-daemon to the binary cache fail with: ``` unable to download ... Problem with the SSL CA cert (path? access rights?) (77). ``` This change ensures that the nix-daemon knows where to find the SSL CA cert file. Fixes #2899 and #3261. (cherry picked from commit b7c0223)
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff d5ecb8d3cd8c...a39798b64ca4