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
stage1: Systemd libraries were renamed
systemd: Remove shutdown.target.wants
systemd: Upgrade from 203 -> 211
cpupower: Add package to replace cpufrequtils
cpu-freq: Use cpupower instead of cpufrequtils

Additionally, put the powersave utility in charge of loading the
cpufrequency modules based on the governor specified in the
configuration.
systemd: Add slices target
systemd: Add networkd service
stage 1: Remove scsi_wait_scan as it is not supported after kernel 3.7
systemd: Add module path to modules-load
systemd: Update from v211 to nixos-v212