php54: add pcntl option
Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc
Adjust kvirc/default.nix to better use stdenv.lib
Ooops licences replaced by licenses
calibre: upgrade 1.5.0 -> 1.8.0

from #1144
Substitute "types.uniq types.string" -> "types.str"
Manual: Fix -I flag
Export only the files of the active definitions
Add some option types
Show correct position info for errors in submodules

E.g.

  The unique option `fileSystems./.device' is defined multiple times, in `/etc/nixos/configuration.nix' and `/etc/nixos/foo.nix'.

This requires passing file/value tuples to the merge functions.
smartd.nix: Fix broken option type
Merge pull request #1146 from Chaddai/master

Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc
Add ZFS dependencies to the initrd so that the zpool command works.
Remove unneeded zfs mount, since zpool automatically mounts everything.

Close #1128.
Remove unused Xfce files
Remove obsolete xfceutils attribute
Strictly check the arguments to mkOption

And fix various instances of bad arguments.
znc: add support for modules, add fish and push module

Close #1148.
Add qpid v0.24

It includes both the broker and the C++ client lib. I had to do some hacks to
prevent the installer from putting thins outside $out.

Close #1134.
sqliteodbc: update to 0.995, add more metadata

close #1122
pythonPackages.substanced: correct sha256