Building of haddock for packages with UTF-8 source is already fixed in the stdenv-updates branch. This fixes modular-arithmetic until that branch is merged. Will send another pull request to add back haddock for that branch.