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: 60429b86ba51
Choose a base ref
...
head repository: NixOS/nix
compare: e3eecb592718
Choose a head ref
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Jan 5, 2020

  1. function-trace: always show the trace 

    If the user invokes nix with --trace-function-calls it means that they
want to see the trace.

(cherry picked from commit 619cc4a)
    @zimbatm @edolstra
    zimbatm authored and edolstra committed Jan 5, 2020
    Copy the full SHA
    c94fd5f View commit details
    Browse the repository at this point in the history

  2. Hide FunctionCallTrace constructor/destructor 

    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 cb90e38)
    @edolstra
    edolstra committed Jan 5, 2020
    Copy the full SHA
    f84c3f9 View commit details
    Browse the repository at this point in the history

  3. Move #include 

    (cherry picked from commit 8beedd4)
(cherry picked from commit 0678e4d)
    @edolstra
    edolstra committed Jan 5, 2020
    Copy the full SHA
    e3eecb5 View commit details
    Browse the repository at this point in the history