Using the upstream patch directly. It's copied in nixpkgs, because: - fetchpatch isn't usable at this point in bootstrapping, - the upstream patch creates collisions in NEWS.
