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: d4609bb3af14
Choose a base ref
...
head repository: NixOS/nix
compare: 86aab6e9a048
Choose a head ref
  • 10 commits
  • 39 files changed
  • 1 contributor

Commits on Oct 24, 2017

  1. Remove the builder-files option 

    You can now include files via the "builders" option, using the syntax
"@<filename>". Having only one option makes it easier to override
builders completely.

For backward compatibility, the default is "@/etc/nix/machines", or
"@<filename>" for each file name in NIX_REMOTE_SYSTEMS.
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    af241ae View commit details
    Browse the repository at this point in the history

  2. Remove the remote-builds option 

    This is superfluous since you can now just set "builders" to empty,
e.g. "--builders ''".
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    25f3262 View commit details
    Browse the repository at this point in the history

  3. nix: Respect -I, --arg, --argstr 

    Also, random cleanup to argument handling.
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    0d59f1c View commit details
    Browse the repository at this point in the history

  4. Handle log messages from build-remote 

    This makes the progress indicator show statuses like "connecting to
'root@machine'".
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    fe9d2f9 View commit details
    Browse the repository at this point in the history

  5. build-remote: Work properly on a chrooted store

    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    f862476 View commit details
    Browse the repository at this point in the history

  6. Progress indicator: Show on what machine we're building 

    E.g.

  $ nix build nixpkgs.hello --builders 'root@wendy'
  [1/0/1 built] building hello-2.10 on ssh://root@wendy: checking for minix/config.h... no
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    be22070 View commit details
    Browse the repository at this point in the history

  7. More progress indicator improvements 

    Fixes #1599.
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    96051dd View commit details
    Browse the repository at this point in the history

  8. More progress indicator improvements 

    In particular, don't show superfluous "fetching path" and "building
path(s)" messages, and show the current round (with --repeat).
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    3460e4c View commit details
    Browse the repository at this point in the history

  9. Allow shorter syntax for chroot stores 

    You can now say '--store /tmp/nix' instead of '--store local?root=/tmp/nix'.
    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    d16fd24 View commit details
    Browse the repository at this point in the history

  10. Add --store argument to legacy commands

    @edolstra
    edolstra committed Oct 24, 2017
    Copy the full SHA
    86aab6e View commit details
    Browse the repository at this point in the history