New object oriented programming library.

New extendScope operation so that you don't have to manually chase haskell dependencies to do a safe package override.
Merge branch 'master' of github.com:NixOS/nixpkgs into haskellPackagesFixpoint
Merge branch 'master' into haskellPackagesFixpoint

Conflicts:
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
Merge branch 'master' into haskellPackagesFixpoint

Conflicts:
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
:Merge branch 'master' into haskellPackagesFixpoint
Merge branch 'master' into haskellPackagesFixpoint
Merge branch 'master' into haskellPackagesFixpoint
Merge branch 'master' into haskellPackagesFixpoint
Merge branch 'master' into haskellPackagesFixpoint
Merge branch 'master' into haskellPackagesFixpoint

Conflicts:
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
Merge branch 'master' into haskellPackagesFixpoint
Merge branch 'haskellPackagesFixpoint' of github.com:NixOS/nixpkgs into haskellPackagesFixpoint