logstash service: make log verbosity configurable.
nixos-iso: Add zfs / btrfs to supportedFilesystems
Upgrade Pure to 0.63
smpeg: fix smpeg-config
SDL_mixer: add mp3 support
kde installer: Add gparted, nixos manual and konsole in the desktop
Fix python26Packages.sqlite3
Atom: updated to 0.139.0
haskell-yi-fuzzy-open: new package
haskell-yi-monokai: new package
haskell-yi-custom: use NIX_* vars for nicer wrap

According to @bennofs , this should now work regardless of what kind of
mess the user is in.
Merge pull request #4646 from geerds/python26-sqlite3

Fix python26Packages.sqlite3
calibre: update from 2.6.0 to 2.7.0
Update Hawkthorne game to v0.12.0
nix-exec: bump
Adding an extra url for nc6. The previous was failing.
cjdns: update 20140928 to 20141023
Merge pull request #4658 from ehmry/cjdns

cjdns: update 20140928 to 20141023
libyubikey: Reformat derivation
hidapi: Add derivation