calibre: upgrade from 1.25.0 to 1.31.0
Merge branch 'master' of git://github.com/urv/nixpkgs

calibre: upgrade from 1.25.0 to 1.31.0