sdlmame: update to latest version
mpd: update to latest version
awesome: add which to build inputs (for awesome-client)
Updating tox to master
clean up git revision handling in several packages
haskell-cpu: update to version 0.1.2
haskell-crypto-numbers: update to version 0.2.3
haskell-crypto-pubkey: update to version 0.2.2
haskell-pem: update to version 0.2.1
mediawiki: Update to 1.20.7
php: Update to 5.4.21
linux: Update to 3.4.69
stlink: fix package name

To stop nixpkgs-lint from saying "stlink: package has no version".
stlink: fix chroot build

Add sha256 attribute to fetchgit to make it a fixed-output derivation
(needed for chroot builds).
git: Update to 1.8.4.3
pypy: 2.1 -> 2.2
ImageMagick and asciidoc build on 64-bit darwin

Tested by @zefhemel

Signed-off-by: Shea Levy <shea@shealevy.com>
Update npm packages to latest npm2nix

Signed-off-by: Shea Levy <shea@shealevy.com>
Add hipache nodePackage

Signed-off-by: Shea Levy <shea@shealevy.com>
Better json parsing

Signed-off-by: Shea Levy <shea@shealevy.com>