Add ghcWithPackages and ghcWithHoogle to hsPkgs

Author: rvl

builder/default.nix

@@ -27,16 +27,29 @@ let
       inherit packages hoogle;
     };
 
+  # Same as haskellPackages.shellFor in nixpkgs.
+  shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {
+    inherit hsPkgs ghcForComponent makeConfigFiles hoogleLocal haskellLib;
+    inherit (buildPackages) glibcLocales;
+  };
+
+  # Same as haskellPackages.ghcWithPackages and ghcWithHoogle in nixpkgs.
+  withPackages = {withHoogle}: packages: shellFor {
+    name = ghc.name + "-with-packages";
+    packages = _: [];
+    additional = packages;
+    inherit withHoogle;
+  };
+
 in {
   # Build a Haskell package from its config.
   # TODO: this pkgs is the adjusted pkgs, but pkgs.pkgs is unadjusted
   build-package = haskellLib.weakCallPackage pkgs ./hspkg-builder.nix {
     inherit haskellLib ghc buildGHC comp-builder;
   };
 
-  # Same as haskellPackages.shellFor in nixpkgs.
-  shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {
-    inherit hsPkgs ghcForComponent makeConfigFiles hoogleLocal haskellLib;
-    inherit (buildPackages) glibcLocales;
-  };
+  inherit shellFor;
+
+  ghcWithPackages = withPackages { withHoogle = false; };
+  ghcWithHoogle = withPackages { withHoogle = true; };
 }

builder/shell-for.nix

@@ -1,21 +1,22 @@
 { lib, stdenv, glibcLocales, pkgconfig, ghcForComponent, makeConfigFiles, hsPkgs, hoogleLocal, haskellLib }:
 
-{ packages, withHoogle ? true, ... } @ args:
+{ packages, additional ? _: [], withHoogle ? true, ... } @ args:
 
 let
   selected = packages hsPkgs;
+  additionalSelected = additional hsPkgs;
   selectedConfigs = map (p: p.components.all.config) selected;
 
   name = if lib.length selected == 1
-    then "ghc-shell-for-${(lib.head selected).name}"
+    then "ghc-shell-for-${(lib.head selected).identifier.name}"
     else "ghc-shell-for-packages";
 
   # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`,
   # because cabal will end up ignoring that built version, assuming
   # new-style commands.
   packageInputs = lib.filter
     (input: lib.all (cfg: input.identifier != cfg.identifier) selected)
-    (lib.concatMap (cfg: cfg.depends) selectedConfigs);
+    (lib.concatMap (cfg: cfg.depends) selectedConfigs ++ additionalSelected);
 
   # Add the system libraries and build tools of the selected haskell
   # packages to the shell.
@@ -53,7 +54,7 @@ let
     # inherit (hsPkgs) hoogle;
   };
 
-  mkDrvArgs = builtins.removeAttrs args ["packages" "withHoogle"];
+  mkDrvArgs = builtins.removeAttrs args ["packages" "additional" "withHoogle"];
 in
   stdenv.mkDerivation (mkDrvArgs // {
     name = mkDrvArgs.name or name;

modules/component-driver.nix

@@ -41,7 +41,7 @@ in
   };
 
   config.hsPkgs =
-    { inherit (builder) shellFor;
+    { inherit (builder) shellFor ghcWithPackages ghcWithHoogle;
       buildPackages = buildModules.config.hsPkgs;
     } //
     lib.mapAttrs