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
base: 61e816217bfd
Choose a base ref
...
head repository: NixOS/nix
compare: 421f1f44931d
Choose a head ref
  • 9 commits
  • 12 files changed
  • 6 contributors

Commits on Jan 4, 2020

  1. EvalState::callFunction(): Make FunctionCallTrace use less stack space 

    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 98ef116)
    @edolstra
    edolstra committed Jan 4, 2020
    Copy the full SHA
    8be0440 View commit details
    Browse the repository at this point in the history

  2. Fix typos 

    (cherry picked from commit 8737980)
    @bwignall @edolstra
    bwignall authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    9b4e998 View commit details
    Browse the repository at this point in the history

  3. Fix progress bar when nix-prefetch-url is piped. 

    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 c935ad3)
    @hvdijk @edolstra
    hvdijk authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    61855a4 View commit details
    Browse the repository at this point in the history

  4. include netinet/in.h in src/nix/main.cc 

    Fixes #3186

(cherry picked from commit b811bd2)
    @edolstra
    ng0 authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    a53e4e2 View commit details
    Browse the repository at this point in the history

  5. Document import <path> syntax 

    (cherry picked from commit d8730fb)
    @ersinakinci @edolstra
    ersinakinci authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    c7b4bf1 View commit details
    Browse the repository at this point in the history

  6. SourceExprCommand::getSourceExpr(): Allocate more space 

    Fixes #3140.

(cherry picked from commit 389a2ce)
    @edolstra
    edolstra committed Jan 4, 2020
    Copy the full SHA
    1ac8c02 View commit details
    Browse the repository at this point in the history

  7. ssh-ng: Don't set CPU affinity on the remote 

    Fixes #3138.

(cherry picked from commit 906d56a)
    @edolstra
    edolstra committed Jan 4, 2020
    Copy the full SHA
    8b44ed0 View commit details
    Browse the repository at this point in the history

  8. Fix sandbox fallback settings 

    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 NixOS/nixpkgs#70856.

(cherry picked from commit 499b038)
    @matthewbauer @edolstra
    matthewbauer authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    10bf534 View commit details
    Browse the repository at this point in the history

  9. Move tmpDirInSandbox to initTmpDir 

    (cherry picked from commit 96c8493)
    @matthewbauer @edolstra
    matthewbauer authored and edolstra committed Jan 4, 2020
    Copy the full SHA
    421f1f4 View commit details
    Browse the repository at this point in the history