Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
haskell-stm-containers: add package version 0.1.2 and its dependencies
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
vagrant: upgrade to 1.6.3
Enable expressions for 'important' parts of the rest framework from Silk.co
openjdk: Update to 7u65-b32
Don't restart systemd-journal-flush

It only needs to be started during boot. Starting it at other times
shouldn't hurt, except that if systemd-journald is restarting at the
same time, the latter might not have a SIGUSR1 signal handler
installed yet, so it might be killed by systemd-journal-flush. (At
least that's my theory about the dead systemd-journald instances in
the build farm...)
haskell-applicative-quoters: new expression
connman: upgrade to version 1.24
e18: enlightenment desktop manager version 18
nixUnstable: Update to 1.8pre3679_f609eec
allow zsh on mac
Merge pull request #3310 from joelteon/master

Allow zsh on mac
Merge pull request #3309 from matejc/e18

e18: enlightenment desktop manager version 18
haskell-thyme: add cpphs build tool dependency
Merge pull request #3312 from bennofs/haskell-applicative-quoters

haskell-applicative-quoters: new expression
Merge pull request #3308 from matejc/connman124

connman: upgrade to version 1.24