follow nix upstream