pythonPackages.sympy: add expression
Adding KVIrc : a IRC Client for Qt and KDE. in kde4.kvirc
Update SlimerJS
Adjust kvirc/default.nix to better use stdenv.lib
Ooops licences replaced by licenses
Add pngquant, it converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved.
Add gitflow

A collection of Git extensions to provide high-level repository operations for Vincent Driessen's branching model
Merge pull request #1139 from offlinehacker/pkgs/pnquant/add

Add pngquant, it converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved.
Merge pull request #1142 from lovek323/sympy

pythonPackages.sympy: add expression
Merge pull request #1149 from offlinehacker/pkgs/gitAndTools.gitflow/add

Add gitflow
ninka: update to 1.1 and refactor
pythonPackages.faker, pythonPackages.fake_factory: add expressions

close #1125
googleMusicmanager: add expression

close #1056
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