Add haskell package 'taffybar'
Add Haskell package 'gtk-traymanager'
haskellPackages.jsonAssertions: New expression
haskellPackages.diff3: New expression
Bumping ATS/Postiats version to 0.0.5.
Merge branch 'master' of git://github.com/ashalkhakov/nixpkgs

Bumping ATS/Postiats version to 0.0.5. #1719
Force a rebuild
spring: use wrapper to set gcc lib path
spring: don't pass glibc
Merge pull request #1716 from ocharles/haskellPackages.diff3

haskellPackages.diff3: New expression
Merge pull request #1715 from ocharles/haskellPackages.jsonAssertions

haskellPackages.jsonAssertions: New expression
Merge pull request #1712 from PkmX/pr-taffybar

Add haskell packages 'gtk-traymanager' and 'taffybar'
springlobby: specify spring run-time dependency paths
springlobby: add unitsync patch
mediawiki: Run update script after initializing the database
mediawiki: Fix some references to /bin/bash
Properly escape passwords sent to chpasswd

The mutableUsers feature uses `chpasswd` to set users passwords.
Passwords and their hashes were being piped into the program using
double quotes ("") to escape. This causes any `$` characters to be
expanded as shell variables. This is a serious problem because all the
password hash methods besides DES use multiple `$` in the hashes. Single
quotes ('') should be used instead to prevent shell variable expansion.
user-groups: Sidestep all password escaping issues

Now passwords are written to a file first
ATI-driver: the hash has changed, reported by: @ikervagyok
Revert "Update hipchat"

This reverts commit 54288f5cfe4e48779d7c08abefa8cbb23d58e58a.