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: b9ae1bdd7a1e
Choose a base ref
...
head repository: NixOS/nix
compare: ac4d43a31bb3
Choose a head ref
  • 9 commits
  • 19 files changed
  • 3 contributors

Commits on Jun 8, 2020

  1. Make the logger customisable

    Add a new `--log-format` cli argument to change the format of the logs.
    The possible values are
    - raw (the default one for old-style commands)
    - bar (the default one for new-style commands)
    - bar-with-logs (equivalent to `--print-build-logs`)
    - internal-json (the internal machine-readable json format)
    thufschmitt committed Jun 8, 2020
    Copy the full SHA
    170e86d View commit details
    Browse the repository at this point in the history
  2. add documentation

    zimbatm authored and thufschmitt committed Jun 8, 2020
    Copy the full SHA
    2c4de6a View commit details
    Browse the repository at this point in the history
  3. Unify the printing of the logs between bar-with-logs and raw

    Make the printing of the build logs systematically go through the
    logger, and replicate the behavior of `no-build-output` by having two
    different loggers (one that prints the build logs and one that doesn't)
    thufschmitt committed Jun 8, 2020
    Copy the full SHA
    4983401 View commit details
    Browse the repository at this point in the history
  4. Style fixes

    edolstra committed Jun 8, 2020
    Copy the full SHA
    c27f926 View commit details
    Browse the repository at this point in the history
  5. Move progress-bar.cc to libmain

    Needed so that we can include it as a logger in loggers.cc without
    adding a dependency on nix
    
    This also requires moving names.hh to libutil to prevent a circular
    dependency between libmain and libexpr
    thufschmitt committed Jun 8, 2020
    Copy the full SHA
    801112d View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2020

  1. Style fixes

    edolstra committed Jun 11, 2020
    Copy the full SHA
    8bd8921 View commit details
    Browse the repository at this point in the history
  2. Shut up warning

    edolstra committed Jun 11, 2020
    Copy the full SHA
    95eb064 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    dd9bb11 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #3073 from tweag/machine-logs

    Add an option to print the logs in a machine-readable format
    edolstra committed Jun 11, 2020
    Copy the full SHA
    ac4d43a View commit details
    Browse the repository at this point in the history