[PATCH nixpkgs 0/2] Pre-merge fixes for Nixpkgs update