We already had a xmonad-nix.patch for XMonad 0.17, so it's just a matter of using it. The old patch for 0.16 can be dropped as well, since we no longer ship that version.