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/nixpkgs
base: 413013294616
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 06b9302baaee
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on May 7, 2020

  1. Revert "nix-daemon.nix: Use 'nix ping-store' to initialize directories"

    This reverts commits 9d0de0d,
    27d2857. 'nix ping-store' is an
    experimental command so it doesn't work in Nix 2.4 unless you set
    'experimental-features = nix-command' in nix.conf.
    edolstra committed May 7, 2020
    Copy the full SHA
    9bf75a2 View commit details
    Browse the repository at this point in the history
  2. nixos-install: 'nix build' -> nix-build

    'nix build' is an experimental command so we shouldn't use it
    yet. (nixos-rebuild also uses 'nix', but only when using flakes, which
    are themselves an experimental feature.)
    edolstra committed May 7, 2020
    Copy the full SHA
    ecdb5c4 View commit details
    Browse the repository at this point in the history
  3. test-driver.py: Fix deadlock when the log queue gets full

    If a program (e.g. nixos-install) writes more than 1000 lines to
    stderr during execute(), then process_serial_output() deadlocks
    waiting for the queue to be processed. So use an unbounded queue
    instead.
    
    We should probably get rid of the structured log output (log.xml),
    since then we don't need the log queue anymore.
    edolstra committed May 7, 2020
    1
    Copy the full SHA
    78f2a83 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #87182 from edolstra/no-experimental

    Don't use the 'nix' command
    edolstra committed May 7, 2020
    Copy the full SHA
    06b9302 View commit details
    Browse the repository at this point in the history