Update with latest Nix changes