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: 941f95284ab5
Choose a base ref
...
head repository: NixOS/nix
compare: 6f3244ce4517
Choose a head ref
  • 12 commits
  • 40 files changed
  • 3 contributors

Commits on May 1, 2020

  1. Fix coverage job

    (cherry picked from commit bc5d484)
    edolstra committed May 1, 2020
    Copy the full SHA
    5eebc4a View commit details
    Browse the repository at this point in the history
  2. rename nix run to nix shell and nix app to nix run

    (cherry picked from commit 5d8504b)
    mkenigs authored and edolstra committed May 1, 2020
    Copy the full SHA
    d6b4047 View commit details
    Browse the repository at this point in the history
  3. rename run to shell in tests

    (cherry picked from commit f459ca5)
    mkenigs authored and edolstra committed May 1, 2020
    Copy the full SHA
    2852a48 View commit details
    Browse the repository at this point in the history
  4. Fix build

    edolstra committed May 1, 2020
    Copy the full SHA
    c089c52 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. remote-store: don't log raw stderr by default

    For remote stores the log messages are already forwarded as structured
    STDERR_RESULT messages so the old format is duplicate information.  But
    still included with -vvv since it could be useful for debugging
    problems.
    
        $ nix build -L /nix/store/nl71b2niws857ffiaggyrkjwgx9jjzc0-foo.drv --store ssh-ng://localhost
        Hello World!
        foo> Hello World!
        [1/0/1 built] building foo
    
    Fixes #3556
    LnL7 committed May 2, 2020
    Copy the full SHA
    f16e24f View commit details
    Browse the repository at this point in the history
  2. logging: handle build log lines in simple logger

    The raw stderr output isn't logged anymore so the build logs need to be
    printed by the default logger in order for the old commands like
    nix-build to still show build output.
    LnL7 committed May 2, 2020
    Copy the full SHA
    4769eea View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Merge pull request #3558 from LnL7/ssh-ng-stderr

    remote-store: don't log raw stderr by default
    edolstra committed May 4, 2020
    Copy the full SHA
    3ebfbec View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    e9f10be View commit details
    Browse the repository at this point in the history
  3. 3
    Copy the full SHA
    a721a0b View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. nix --help: Group commands

    edolstra committed May 5, 2020
    Copy the full SHA
    f132d82 View commit details
    Browse the repository at this point in the history
  2. nix doctor: Consistency

    edolstra committed May 5, 2020
    Copy the full SHA
    909b4a8 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    6f3244c View commit details
    Browse the repository at this point in the history