Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
haskell-stm-containers: add package version 0.1.2 and its dependencies
xscreensaver: update from 5.26 to 5.29
haskell-data-fix: new package
haskellPackages: use static-enabled 'gmp' to enable statically linked Haskell binaries

Pass '-optl-static -optl-pthread' to GHC to enable static linking.

Fixes <https://github.com/NixOS/nixpkgs/issues/3193>. Further details can be
found at <http://permalink.gmane.org/gmane.linux.distributions.nixos/13526>.
ghc: update version 7.8.2 to 7.8.3
haskell-packages.nix: cosmetic
Switch default Haskell compiler to GHC 7.8.3.
cabal: cosmetic
cryptol2: build with ghc 7.6.3 to avoid errors with 7.8.x
darcs: build with ghc 7.6.3 to avoid errors with 7.8.x
haskell-platform: build 2009.x with sufficiently old version of 'mtl' to avoid build errors in CGI library
haskell-platform-2010.1.0.0: mark as broken, the source code is no longer available from haskell.org
ghc 7.0.2 and 7.0.3 are "broken" because of build errors with recent versions of GCC

  rts/StgCRun.c: In function 'StgRunIsImplementedInAssembler':

  rts/StgCRun.c:208:1:
       error: frame pointer required, but reserved
       StgRunIsImplementedInAssembler(void)
       ^

  In file included from includes/Stg.h:230:0:
      0,
                       from rts/StgCRun.c:70:

  includes/stg/Regs.h:323:20:
       note: for 'Sp'
       GLOBAL_REG_DECL(P_,Sp,REG_Sp)
                          ^

  includes/stg/Regs.h:174:54:
       note: in definition of macro 'GLOBAL_REG_DECL'
       #define GLOBAL_REG_DECL(type,name,reg) register type name REG(reg);
                                                            ^
Update SBV to v3.1
gtksourceview 3.12: hard code data dirs to nix store path
keybinder-3.0: Add package

keybinder-3.0 is for GTK+ 3, whereas keybinder (already in nixpkgs) is
for GTK+ 2.

This adds version 0.3.0 of keybinder-3.0, which we named "keybinder3" in
nixpkgs to (hopefully) lessen the confusion about what is package name
and what is version number.

[Bjørn: extend commit message beyond summary line]
twister: Add new package, version 0.9.22.

This includes another source-only derivation for the web interface (and
patches the path into the twister binary), so there shouldn't be a need
to move it into ~/.twister/html separately.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Merge pull request #3232 from peti/haskell-updates

Update default Haskell compiler to GHC 7.8.3 (and other stuff)