Error in include/nix/comparator.hh?

As of this morning, I can no longer apply my home-manager config on macOS. I get an error from something internal to nix itself, and I’m not sure how to debug. I even tried uninstalling and reinstalling nix itself.

Nix version: nix (Nix) 2.15.1
home-manager version: 23.11-pre
My flake: https://github.com/mrjones2014/dotfiles/blob/814bafd7bad35de7e52417b941025f8ac84e4e32/flake.nix

Here’s the error when I run home-manager switch --flake .#mac:

error: builder for '/nix/store/aswn6ic63glfv17r2vc60w5wwmjn5ar4-nixos-option.drv' failed with exit code 2;
       last 10 log lines:
       > #define GENERATE_EQUAL(args...) GENERATE_ONE_CMP(==, args)
       >                                 ^
       > /nix/store/122k61dvczlb9hi9ahqs5hfwrj6nbjzk-nix-2.15.1-dev/include/nix/comparator.hh:26:14: note: expanded from macro 'GENERATE_ONE_CMP'
       >       return fields1 COMPARATOR fields2; \
       >              ^
       > fatal error: too many errors emitted, stopping now [-ferror-limit=]
       > 20 errors generated.
       > make[2]: *** [CMakeFiles/nixos-option.dir/build.make:76: CMakeFiles/nixos-option.dir/nixos-option.cc.o] Error 1
       > make[1]: *** [CMakeFiles/Makefile2:83: CMakeFiles/nixos-option.dir/all] Error 2
       > make: *** [Makefile:136: all] Error 2
       For full logs, run 'nix-store -l /nix/store/aswn6ic63glfv17r2vc60w5wwmjn5ar4-nixos-option.drv'.
error: 1 dependencies of derivation '/nix/store/3mgixg1fhpwg7hm8r98m262i0ghyssw9-home-manager.drv' failed to build
error: 1 dependencies of derivation '/nix/store/cp422mnlpb31qr1mhh15y793i098k0g3-home-manager-applications.drv' failed to build
error: 1 dependencies of derivation '/nix/store/i4f3f2f3f20999n00z9p915chmd88vvs-home-manager-fish-completions.drv' failed to build
error: 1 dependencies of derivation '/nix/store/0rckvm48yxhs91wz0a4csv4b1msb54p7-home-manager-fonts.drv' failed to build
error: 1 dependencies of derivation '/nix/store/bhxc5xqmqk6vnqkjjjvwiqqqf4hb4jrw-home-manager-path.drv' failed to build
error: 1 dependencies of derivation '/nix/store/1gx6ffp2jk21pjr65j9nyjvqwzx55pwh-man-paths.drv' failed to build
error: 1 dependencies of derivation '/nix/store/p7fs4qrvy34kb3z1cd67c6zdljqrl9va-home-manager-generation.drv' failed to build

And when I run the command suggested by the output there to get more logs: nix error output · GitHub

See https://github.com/NixOS/nixpkgs/pull/237442#issuecomment-1635760958 for my report
and nixos-option: use C++20 by emilazy · Pull Request #242954 · NixOS/nixpkgs · GitHub for the actual fix.

Sorry, I’m a bit of a Nix noob – how do I get the fix locally?

Ah, I see from here https://nixpk.gs/pr-tracker.html?pr=242954

I either need to just wait till its on nixos-unstable or switch to nixpkgs-unstable. I’ll do the latter temporarily until it’s on nixos-unstable. Thanks!