17be09a1f0
Patches have been imported into nixpkgs and manually edited to avoid merge conflicts on ChangeLog / NEWS files.