Add missing package keys

Author: hamishmack

lib/ghcjs-project.nix

@@ -171,8 +171,6 @@ let
             })
             {
                 packages.ghcjs.doHaddock = false;
-                packages.haddock-ghcjs.doHaddock = false;
-                packages.haddock-api-ghcjs.doHaddock = false;
                 packages.ghc.flags.ghci = true;
                 packages.ghci.flags.ghci = true;
                 # packages.ghcjs.components.library.configureFlags = [ "-fno-wrapper-install" ];

overlays/armv6l-linux.nix

@@ -24,7 +24,7 @@ final: prev:
           # Therefore let's enable doCrossCheck here!
           doCrossCheck = pkgs.stdenv.hostPlatform.isWindows;
         };
-      in {
+      in prev.haskell-nix.haskellLib.addPackageKeys {
         packages = {
           # clock 0.7.2 needs to be patched to support cross compilation.
           clock.patches              = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isAarch32 [ ({ version }: (if version == "0.7.2" then ./patches/clock-0.7.2.patch else null)) ];

overlays/darwin.nix

@@ -2,7 +2,7 @@ _final: prev:
 {
   haskell-nix = prev.haskell-nix // ({
     defaultModules = prev.haskell-nix.defaultModules ++ [
-      ({ pkgs, buildModules, config, lib, ... }:
+      ({ pkgs, buildModules, config, lib, ... }: prev.haskell-nix.haskellLib.addPackageKeys
         {
           packages = { } // pkgs.lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc)
             {

overlays/ghcjs.nix

@@ -2,7 +2,7 @@ final: prev:
 {
   haskell-nix = prev.haskell-nix // ({
     defaultModules = prev.haskell-nix.defaultModules ++ final.lib.optional final.stdenv.hostPlatform.isGhcjs (
-      ({ pkgs, buildModules, config, lib, ... }: {
+      ({ pkgs, buildModules, config, lib, ... }: prev.haskell-nix.haskellLib.addPackageKeys {
         # Apply the patches that came with `ghcjs`
         # Also add a "Keep alive" message to prevent hydra timeouts when hsc2hs runs
         packages = pkgs.lib.genAttrs ["base" "directory" "filepath" "ghc-prim" "integer-gmp" "process" "template-haskell" "time" "unix" "Win32" ]