Holders Senegal will face a resurgent Nigeria and Sudan in Group D of the rescheduled African Nations Championship (CHAN) being co-hosted by Kenya, Tanzania and Uganda in August.