grive: fix build with new binutils headers
pkgs/top-level/haskell-defaults.nix: cosmetic
haskell-packages.nix: add 'disableTests' convenience function
haskell-defaults.nix: don't pass inconsistent Cabal versions to cabal2nix
jailbreak-cabal: build jailbreak-cabal with a version of Cabal that has its unit tests disabled

Cabal's unit test suite depends on testFrameworkQuickcheck2, which
depends on jailbreakCabal, which depends on Cabal: *BOOM*
haskell-shake: add version 0.9.1
panotools: disabling tests due to strange failures
recutils: fix build with new glibc
Update lrzip
Adding ZPAQ archiver
recutils: supply the forgotten patch
ffmpeg: update 1.1 to 1.1.3
Adding reference to ZPAQ in all-packages
applications/audio/caps: New nixpkg.
vdrift: update and fix

Tested on two laps :-)
netpbm: update and attempt to fix i686 build
applications/audio/jack-rack: New nixpkg.
xfdesktop: minor update
Merge branch 'master' into x-updates

Conflicts (taken master versions):
	pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
	pkgs/desktops/xfce/applications/gigolo.nix
	pkgs/desktops/xfce/applications/mousepad.nix
	pkgs/desktops/xfce/applications/ristretto.nix
	pkgs/desktops/xfce/applications/terminal.nix
	pkgs/desktops/xfce/applications/xfce4-mixer.nix
	pkgs/desktops/xfce/applications/xfce4-notifyd.nix
	pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
	pkgs/desktops/xfce/art/xfce4-icon-theme.nix
	pkgs/desktops/xfce/core/exo.nix
	pkgs/desktops/xfce/core/garcon.nix
	pkgs/desktops/xfce/core/gtk-xfce-engine.nix
	pkgs/desktops/xfce/core/libxfce4ui.nix
	pkgs/desktops/xfce/core/libxfce4util.nix
	pkgs/desktops/xfce/core/libxfcegui4.nix
	pkgs/desktops/xfce/core/thunar-volman.nix
	pkgs/desktops/xfce/core/thunar.nix
	pkgs/desktops/xfce/core/tumbler.nix
	pkgs/desktops/xfce/core/xfce4-appfinder.nix
	pkgs/desktops/xfce/core/xfce4-panel.nix
	pkgs/desktops/xfce/core/xfce4-power-manager.nix
	pkgs/desktops/xfce/core/xfce4-session.nix
	pkgs/desktops/xfce/core/xfce4-settings.nix
	pkgs/desktops/xfce/core/xfconf.nix
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/desktops/xfce/core/xfwm4.nix
	pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
	pkgs/development/libraries/webkit/default.nix
	pkgs/top-level/all-packages.nix
jbig2dec: fix download URI