tree: update to version 1.7.0
nitrogen: patchShebangs instead of patchfile + /usr/bin/env

This hopefully fixes the build on Hydra.
Warzone2100: Update to 3.1.1.

Changed to use openal-soft, which makes sound work,
in combination with https://github.com/NixOS/nixpkgs/pull/2947 .

Added optional installation of campaign videos, not enabled by default.
libtorrent: update to 0.13.4
rtorrent: update to 0.9.4
Merge pull request #2956 from Fuuzetsu/rtorrent

rtorrent
Merge pull request #2934 from CodeBlock/spawn-fcgi-update

update spawn-fcgi to 1.6.4
Change to xpra version 0.11.6 as 0.12.5 was not working

Version 0.11.6 was the latest version that I was able to get building
and running on NixOS. Unfortunately my previous commit for 0.12.5 was
an error and incomplete.
Application.ini does not refer correctly

The "Application.ini" provided with Thunderbird does not correctly set the path to the icon location. Visa vi it refers to '$out/lib/thunderbird-17.0.11esr', which doesn't exist, but '$out/lib/thunderbird-17.0.11' does. To remedy this problem I added a new variable called 'verName" which adds 'esr' after the variable '$version'. Then change the variables necessary so that the build process sets working references.

Fuuzetsu suggested putting the verName variable inside of mkDerivation. I cannot surmise.
New derivation: hxt-tagsoup #haskell
Merge pull request #2962 from fmapfmapfmap/hxt-tagsoup

New derivation: hxt-tagsoup #haskell
Merge #2798: stdenv and a few other big updates

Stdenv-changing things:
    - gcc 4.8.2 -> 4.8.3
    - long-running grsecurity branch
Others:
    - pkgconfig update
    - CVE for libtasn1, dbus

Conflicts (simple):
    pkgs/development/compilers/ghc/7.6.3.nix
Update haskell-http-kit to version 0.5.0
Update haskell-aeson-qq to version 0.7.2
Merge pull request #2967 from sol/master

Update haskell-http-kit and haskell-aeson-qq
hscolour-bootstrap: allow setting RTS options for the hscolour binary we use to generate our documentation

Other tools like hsc2hs or haddock allows this, too, and some tools explicitly
set memory limits on these tools during the build (i.e. llvm-general-pure) by
exposing a GHCRTS environment variable. See [1] for a concrete example of this
issue.

[1] https://github.com/NixOS/nixpkgs/issues/2939
haskell-git-annex: update to version 5.20140613
hscolour-bootstrap: GHC 6.10.x and earlier don't support the -rtsopts option
nixUnstable: bump
Fix generation of synergy-{client,server} when disabled