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: 365587548330
Choose a base ref
...
head repository: NixOS/nix
compare: 5df687c31602
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 26, 2020

  1. libmain/progress-bar: don't trim whitespace on the left

    When running `nix build -L` it can be fairly hard to read the output if
    the build program intentionally renders whitespace on the left. A
    typical example is `g++` displaying compilation errors.
    
    With this patch, the whitespace on the left is retained to make the log
    more readable:
    
    ```
    foo> no configure script, doing nothing
    foo> building
    foo> foobar.cc: In function 'int main()':
    foo> foobar.cc:5:5: error: 'wrong_func' was not declared in this scope
    foo>     5 |     wrong_func(1);
    foo>       |     ^~~~~~~~~~
    error: --- Error ------------------------------------------------------------------------------------- nix
    error: --- Error --- nix-daemon
    builder for '/nix/store/i1q76cw6cyh91raaqg5p5isd1l2x6rx2-foo-1.0.drv' failed with exit code 1
    ```
    Ma27 committed Sep 26, 2020
    Copy the full SHA
    a76fb07 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Merge pull request #4077 from Ma27/left-whitespace-log

    libmain/progress-bar: don't trim whitespace on the left
    edolstra committed Sep 28, 2020
    Copy the full SHA
    5df687c View commit details
    Browse the repository at this point in the history