pixman: bugfix update, remove withPNG option

The option seemed useless.
mesa: bugfix update
qt3, graphicsmagick137, fox, neverball: fix build

Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
wmctrl: apply patch from debian to fix listing windows
freetype: flatten include to fix several builds

I just wonder why freetype-2.5 needed to move headers around.
file-roller: fix icons
Merge recent master into x-updates

Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
Adding retroshare 0.6 (unstable)
linux_*: update, including CVE-2014-4699 (most likely)

CC #3196. No updates yet on 3.2 and 3.12 branches.
git-annex: Allow building on darwin again
haskell-ghc-mod: Correct patch to ghc-process.el

This change has been accepted upstream, so soon it will not be necessary.
haskell-clay: add package version 0.9.0.1
haskell-stm-containers: add package version 0.1.2 and its dependencies
lambdabot: fix @type command, add ghci to the PATH
Update opkg to latest version, adpot it and add meta-information.
Merge pull request #3226 from hrdinka/haskell-clay

haskell-clay: add package version 0.9.0.1
Merge pull request #3174 from pSub/dconf-issue

Fixed settings issue.
Merge pull request #3215 from refnil/master

Add bitbucket-cli to nixpkgs
haskell-HPDF: re-generate with cabal2nix
cdrtools: mark as broken

https://github.com/NixOS/nixos/issues/231