calibre: upgrade from 1.25.0 to 1.31.0
Make cpufrequtils compilation pure.
mailutils is broken.

#887
Merge branch 'master' of git://github.com/urv/nixpkgs

calibre: upgrade from 1.25.0 to 1.31.0
nmap: Build the non-graphical version by default
Merge branch 'make-cpufrequtils-pure' of git://github.com/alexanderkjeldaas/nixpkgs

Make cpufrequtils compilation pure.
Temporary patch for Wireshark build
git: Remove phony not-supported wrappers.

Fixes #1751
Merge branch 'master.nmap' of git://github.com/wkennington/nixpkgs

nmap: Build the non-graphical version by default