Add some packages
Merge pull request #4807 from wizeman/u/zfs-improvements

ZFS improvements
Re-enable ZFS in installer image

Hopefully #4807 fixes http://hydra.nixos.org/build/16883184
Merge pull request #4890 from vbgl/jedit

jEdit: update from 4.4.2 to 5.1.0
Fix software-version function in SBCL by changing uname location from /bin/
Add cl-html-parse lisp package
cvxopt: fix license typo (close #4974)
Merge pull request #4214 from manveru/keybase

keybase-node-client: 0.7.0
checkinstall: Fix RPM builds

https://bugzilla.novell.com/show_bug.cgi?id=561317
mozart: use longDescription field
Matching hspec-hspec2

        Upgraded hspec2 to 0.6.
        Upgraded hspec to 2.0.1.
        This allows (recursively) depending on hspec2 and hspec to work nicely,
        since now hspec2 is just a re-export of hspec.
haskell-Unixutils: re-generate expression with cabal2nix
haskell-threadscope: update to version 0.2.5
haskell-github-backup: update to version 1.20141110
haskell-HDBC-odbc: update to version 2.4.0.0
haskell-HFuse: update to version 0.2.4.4
haskell-HandsomeSoup: update to version 0.3.5
haskell-cabal-cargs: update to version 0.7.4
haskell-cabal-lenses: update to version 0.4.1
haskell-cgrep: update to version 6.4.7