Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
haskell-stm-containers: add package version 0.1.2 and its dependencies
Added Rest For Haskell and dependencies (rest-core, rest-types, rest-snap etc...)
Merge branch 'master' of github.com:aycanirican/nixpkgs
Added more rest packages.
Enable expressions for 'important' parts of the rest framework from Silk.co
usb-modeswitch: Update to 2.2.0.
Merge branch 'master' of https://github.com/NixOS/nixpkgs
Revert "titanium: Bump to 3.3.0"

This reverts commit 4426b8a3a1cbab80291bee8769e15f601b62725c. It
causes an infinite recursion during Nixpkgs evaluation:

http://hydra.nixos.org/build/12608698

(@svanderburg)
haskell-codex: jailbreak due to circular dependency

It seems the codex-0.1.0.2 build requires 0.1.0.1.
haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically
haskell-git-annex: fix for darwin

@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
Added cgrep utility.
hhvm: 3.1.0 -> 3.2.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:aycanirican/nixpkgs
Merge remote-tracking branch 'upstream/master'
Merge branch 'haskellPackages.rest'
resolved conflicts