about summary refs log tree commit diff
AgeCommit message (Collapse)AuthorFilesLines
2020-01-05 Move #includeEelco Dolstra3-2/+3
(cherry picked from commit 8beedd44861d1fe7208609ee8d231ca1c02dedf6) (cherry picked from commit 0678e4d56a839f940af8aa70059ced48b393e817)
2020-01-05 Hide FunctionCallTrace constructor/destructorEelco Dolstra3-15/+20
This prevents them from being inlined. On gcc 9, this reduces the stack size needed for nix-instantiate '<nixpkgs>' -A texlive.combined.scheme-full --dry-run from 12.9 MiB to 4.8 MiB. (cherry picked from commit cb90e382b5b6e177ea902b3909fd1897643ae3cd)
2020-01-05 function-trace: always show the tracezimbatm3-6/+4
If the user invokes nix with --trace-function-calls it means that they want to see the trace. (cherry picked from commit 619cc4af855fab7b0400586a4fd40745b23e72ad)
2020-01-04 .version: Remove newlineEelco Dolstra1-1/+1
2020-01-04 Document builtins.placeholderArnout Engelen1-0/+10
(cherry picked from commit 4e70652ee33641a6cfddbfb9b7d741515f1bf98a)
2020-01-04 Add testcase for attrset using __overrides and dynamic attrsPuck Meerburg2-0/+5
(cherry picked from commit cdadbf770855e828a0f64d70a47db43e920ad137)
2020-01-04 Ensure enough space in attrset bindings when using both __overrides and ↵Puck Meerburg1-1/+1
dynamic attributes (cherry picked from commit cd55f91ad2075d5ebb506950dfbc4161cab22db5)
2020-01-04 doc: Document `--dry-run` option for `nix-build`Maximilian Bosch1-0/+5
(cherry picked from commit 52ffe2797a6a943bac968e92ad443a567dfdf80e)
2020-01-04 docs: correct default location of log directoryKevin Stock1-1/+1
(cherry picked from commit cea05e5ee758daad40047db0b861980d80da2e85)
2020-01-04 builtins.toJSON: fix __toString usageRobin Gloster5-8/+29
(cherry picked from commit e583df52800b4baa1564b027fe3b83a21756c2cc)
2020-01-04 install-multi-user.sh: Remove unused variablesEelco Dolstra1-3/+0
https://hydra.nixos.org/build/104119659 (cherry picked from commit 2f96a89646c6e55e2f1bbb80805dcbbe60fa94ae)
2020-01-04 Remove superfluous IAM action for S3 cacheChaz Schlarp1-1/+0
`s3:ListObjects` isn't a real IAM action, but _is_ the name of an S3 API method. `s3:ListBucket` is the relevant action for that method. https://docs.aws.amazon.com/IAM/latest/UserGuide/list_amazons3.html (cherry picked from commit c92ea927e508f3c06b6b3ee68e1f0565264cac2c)
2020-01-04 Tweak path hintErsin Akinci1-1/+2
(cherry picked from commit f107a270026596e525bdf8df0e2d331783ec4a10)
2020-01-04 Add hint about path in builtins.importErsin Akinci1-0/+4
(cherry picked from commit b7a936224ee6e1ad9c842f618bbd5bc1864ebd54)
2020-01-04 Revert "Document import <path> syntax"Ersin Akinci1-9/+1
This reverts commit d8730fb86facadbef22d3df7f8a743a56e7ed53c. (cherry picked from commit 9be7787ec04d604a4e65a22a6b9ae56567aaf618)
2020-01-04 Fix unset variable in installerSteven Shaw1-4/+1
(cherry picked from commit f0ec4b4ce478a8d2760203e8192275b88c770e1c)
2020-01-04 Make nix-daemon.plist less fragile on macOSDan Callahan1-1/+1
We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path. That means we're hardcoding something like: /bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon That seems unnecessarily fragile. It might be better to wait4path on the path we intend to call. (cherry picked from commit 8c4a5e7ba1990348b9497c0fc4dc236dda3e7986)
2020-01-04 Copy instead of linking launch agentMatthew Bauer2-2/+2
On Catalina, the /nix filesystem might not be mounted at start time. To avoid this service not starting, we need to keep the launch agent outside of the Nix store. A wait4pid will hold for our /nix dir to be mounted. Fixes #3125. (cherry picked from commit 0847f2f1b3145a62dc34707ba788275ce6b6fc57)
2020-01-04 Bump version numberEelco Dolstra1-1/+1
2020-01-04 Disable the evalNixOS testEelco Dolstra1-2/+2
It also OOMs. https://hydra.nixos.org/build/105942679 (cherry picked from commit 99af822004418b25b6d04eca67949c62e770c16b)
2020-01-04 Disable the evalNixpkgs testEelco Dolstra1-1/+3
It constantly OOMs. https://hydra.nixos.org/build/105784912 (cherry picked from commit 35732a95bcdc0a4b4492845205e6283fcc88fd0d)
2020-01-04 Move tmpDirInSandbox to initTmpDirMatthew Bauer1-8/+8
(cherry picked from commit 96c84937c49435525d0733437aa88902b2c8caf6)
2020-01-04 Fix sandbox fallback settingsMatthew Bauer1-26/+34
The tmpDirInSandbox is different when in sandboxed vs. non-sandboxed. Since we don’t know ahead of time here whether sandboxing is enabled, we need to reset all of the env vars we’ve set previously. This fixes the issue encountered in https://github.com/NixOS/nixpkgs/issues/70856. (cherry picked from commit 499b0388759db0f9f385da402a4bba551268aa99)
2020-01-04 ssh-ng: Don't set CPU affinity on the remoteEelco Dolstra3-1/+9
Fixes #3138. (cherry picked from commit 906d56a96b442d4dd8f924c1ce0d1eec0e214af3)
2020-01-04 SourceExprCommand::getSourceExpr(): Allocate more spaceEelco Dolstra1-1/+1
Fixes #3140. (cherry picked from commit 389a2cebed7cd72bda524ece0a56af2888cd80b6)
2020-01-04 Document import <path> syntaxErsin Akinci1-1/+9
(cherry picked from commit d8730fb86facadbef22d3df7f8a743a56e7ed53c)
2020-01-04 include netinet/in.h in src/nix/main.ccng01-0/+1
Fixes #3186 (cherry picked from commit b811bd2172bc9796f42b87996f455d4e5e4382ba)
2020-01-04 Fix progress bar when nix-prefetch-url is piped.Harald van Dijk2-2/+2
The intent of the code was that if the window size cannot be determined, it would be treated as having the maximum possible size. Because of a missing assignment, it was actually treated as having a width of 0. The reason the width could not be determined was because it was obtained from stdout, not stderr, even though the printing was done to stderr. This commit addresses both issues. (cherry picked from commit c935ad3f025d5c3d8026711a1eb50b2917b61d59)
2020-01-04 Fix typosBrian Wignall2-2/+2
(cherry picked from commit 8737980e75bf14cae278f596ac26577bec94b3f9)
2020-01-04 EvalState::callFunction(): Make FunctionCallTrace use less stack spaceEelco Dolstra1-4/+3
The FunctionCallTrace object consumes a few hundred bytes of stack space, even when tracing is disabled. This was causing stack overflows: $ nix-instantiate '<nixpkgs> -A texlive.combined.scheme-full --dry-run error: stack overflow (possible infinite recursion) This is with the default stack size of 8 MiB. Putting the object on the heap reduces stack usage to < 5 MiB. (cherry picked from commit 98ef11677c43db9aa669768d9f0cbec704e8831c)
2019-10-10 nix verify: Fix uninitialized variableEelco Dolstra1-2/+2
(cherry picked from commit 95cf23ee7c5b0fd69b21811989a5668f4261fd51)
2019-10-10 nix-env: Ignore failures creating ~/.nix-profile and ~/.nix-defexprEelco Dolstra1-14/+20
https://hydra.nixos.org/build/102803093 (cherry picked from commit c3aaf3b8da1a925c569389f13a861816a781a3c8)
2019-10-10 DohEelco Dolstra1-1/+1
https://hydra.nixos.org/build/102803044 (cherry picked from commit bda64a2b0f79346012332ed18f5a76388e6d9bae)
2019-10-10 nix-env: Create ~/.nix-defexpr automaticallyEelco Dolstra3-30/+12
(cherry picked from commit c9159f86cc9a2fc07e2ab1217c2d8a8824123df4)
2019-10-10 nix-env: Create ~/.nix-profile automaticallyEelco Dolstra9-42/+31
(cherry picked from commit 9348f9291e5d9e4ba3c4347ea1b235640f54fd79)
2019-10-09 Force per-user group to a known valueEelco Dolstra1-1/+1
(cherry picked from commit 20eec802ff11dd2b152715cd5c81b756d318219d)
2019-10-09 TypoEelco Dolstra1-1/+1
(cherry picked from commit 9277e72cb0aac72100c01334fdf25ea79d19052e)
2019-10-09 Go back to 755 permission on per-user directoriesEelco Dolstra1-1/+1
700 is pointless since the store is world-readable anyway. And per-user/root/channels must be world-readable. (cherry picked from commit d7bae5680fc26303acb9a9ee1a202f537841a624)
2019-10-09 nix-profile.sh: Remove coreutils dependencyEelco Dolstra1-4/+2
(cherry picked from commit 61a6176acaa8522cbcf091a34a663ef45307fef7)
2019-10-09 nix-profile.sh: Don't create .nix-channelsEelco Dolstra3-11/+0
This is already done by the installer, so no need to do it again. (cherry picked from commit 26762ceb8629af95300c0cc8c372a99282060dc1)
2019-10-09 Remove some redundant initializationEelco Dolstra1-6/+0
(cherry picked from commit c43d9f6131102f2761f22b1ec26f345d357f169c)
2019-10-09 Remove world-writability from per-user directoriesEelco Dolstra11-43/+41
'nix-daemon' now creates subdirectories for users when they first connect. Fixes #509 (CVE-2019-17365). Should also fix #3127. (cherry picked from commit 5a303093dcae1e5ce9212616ef18f2ca51020b0d)
2019-10-09 Filter ANSI escape sequences in -L outputEelco Dolstra1-1/+1
Otherwise, builds like NixOS VM tests may leave the terminal in a weird state and do resets. (cherry picked from commit 4331eeb13d241dfe2d2e6a01c53915c556cac94f)
2019-10-09 Bump version numberEelco Dolstra1-1/+1
2019-10-09 docs: Note that tryEval doesn't do deep evaluationSilvan Mosberger1-2/+8
(cherry picked from commit e4ea3e03066a760c8cd462108af99aebaaa44c1b)
2019-10-09 Disable OpenSSL lock callback on OpenSSL >= 1.1.1Eelco Dolstra1-0/+4
(cherry picked from commit a56b51a0ba7b0d6fdff7fd0127a118185b146f4f)
2019-10-09 docs: Fix a typo in github in an exampleJulien Tanguy1-1/+1
(cherry picked from commit 92ede15dd902f7c1d2771c194b8bb73fe406840f)
2019-10-09 docs: Use the explicit ref for fetchGit with a tagJulien Tanguy1-4/+1
With the merge of #2582, the syntax "tags/1.9" for refs does not work anymore. However, the new syntax "refs/tags/1.9" seems to support annotated tags, such as "refs/tags/2.0". Closes #2385. (cherry picked from commit ae244af242ca3621e5a3b9196f27d9fcbf297266)
2019-10-09 Move 'builtins.splitVersion' to position respecting alphabetical orderAlexandre Esteves1-12/+13
(cherry picked from commit 9533d85ce009c65722a2addc55b64ee51f15dea3)
2019-10-09 libstore: don't forward --show-tracezimbatm1-0/+1
(cherry picked from commit e63c9e73e3e5d1f31fa5065c9ff59f442dd07d0e)