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: 1ab9da915422
Choose a base ref
...
head repository: NixOS/nix
compare: 9223603908ab
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 8, 2020

  1. Fix 'got unknown message type 1 from Nix daemon' 

    Example:

  $ nix-build -E 'with import <nixpkgs> {}; runCommand "foo" { x = runCommand "bar" {} "exit 1"; } "echo foo; exit 1"'
  warning: unknown setting 'auto-allocate-uids'
  these 2 derivations will be built:
    /nix/store/v4fbdbhcdi949929a67g8farwf72zgam-bar.drv
    /nix/store/k4fsvrjl7cp2xpz7927iv7g0dqj1zyhs-foo.drv
  warning: unknown setting 'auto-allocate-uids'
  building '/nix/store/v4fbdbhcdi949929a67g8farwf72zgam-bar.drv'...
  error: --- Error ----------------------------------------------------------------------------------------------------------------------------------------------------------------- nix-daemon
  builder for '/nix/store/v4fbdbhcdi949929a67g8farwf72zgam-bar.drv' failed with exit code 1
  error: --- Error ------------------------------------------------------------------------------------------------------------------------------------------------------------------ nix-build
  got unknown message type 1 from Nix daemon
    @edolstra
    edolstra committed Jul 8, 2020
    Copy the full SHA
    16ec778 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into flakes

    @edolstra
    edolstra committed Jul 8, 2020
    Copy the full SHA
    9223603 View commit details
    Browse the repository at this point in the history