diff --git a/WORKSPACE b/WORKSPACE
index c06fcc2ed..54bd542f3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -41,7 +41,12 @@ load(
     "haskell_register_ghc_nixpkgs",
 )
 
+# Register a Haskell toolchain with all required external
+# dependencies.
+#
+# All dependencies need to be set up in thirdParty.ghc in default.nix
 haskell_register_ghc_nixpkgs(
-    version = "8.6.4",
-    repositories = { "nixpkgs": "default.nix" }
+    version = "8.6.5",
+    repositories = { "nixpkgs": "default.nix" },
+    attribute_path = "thirdParty.ghc",
 )
diff --git a/default.nix b/default.nix
index 771128a8a..7c264653d 100644
--- a/default.nix
+++ b/default.nix
@@ -3,10 +3,30 @@
 
 let
   localPkgs = super: pkgs: {
+    # Local projects should be added here:
     tazjin.tazblog = import ./services/tazblog { inherit pkgs; };
     tazjin.gemma = import ./services/gemma { inherit pkgs; };
 
+    # Third-party projects (either vendored or modified from nixpkgs)
+    # should be added here:
     thirdParty.gitAppraise = pkgs.callPackage ./third_party/go/git-appraise/git-appraise {};
+    thirdParty.ghc = pkgs.haskell.packages.ghc865.ghcWithPackages(p: with p; [
+      acid-state
+      base64-bytestring
+      blaze-html
+      containers
+      cryptohash
+      hamlet
+      happstack-server
+      ixset
+      markdown
+      mtl
+      network
+      network-uri
+      options
+      rss
+      safecopy
+    ]);
   };
 
   # TODO(tazjin): It might be preferable to pin a specific commit of