Merge proposals

Nix-nix has no merge proposals.