Rename withPackage to ghcForComponent

Author: rvl

builder/comp-builder.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, ghc, lib, pkgconfig, writeText, runCommand, haskellLib, nonReinstallablePkgs, withPackage, hsPkgs }:
+{ stdenv, buildPackages, ghc, lib, pkgconfig, writeText, runCommand, haskellLib, nonReinstallablePkgs, ghcForComponent, hsPkgs }:
 
 { componentId
 , component
@@ -181,8 +181,9 @@ let
 
   # Unfortunately, we need to wrap ghc commands for cabal builds to
   # work in the nix-shell. See ../doc/removing-with-package-wrapper.md.
-  shellWrappers = withPackage {
-    inherit package configFiles;
+  shellWrappers = ghcForComponent {
+    componentName = fullName;
+    inherit configFiles;
   };
 
   # the target dir for haddock documentation

builder/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, writeText, runCommand, pkgconfig, nonReinstallablePkgs, withPackage, hsPkgs }:
+{ pkgs, buildPackages, stdenv, lib, haskellLib, ghc, buildGHC, fetchurl, writeText, runCommand, pkgconfig, nonReinstallablePkgs, ghcForComponent, hsPkgs }:
 
 { flags
 , package
@@ -72,7 +72,7 @@ let
       '';
     };
 
-  comp-builder = haskellLib.weakCallPackage pkgs ./comp-builder.nix { inherit ghc haskellLib nonReinstallablePkgs withPackage hsPkgs; };
+  comp-builder = haskellLib.weakCallPackage pkgs ./comp-builder.nix { inherit ghc haskellLib nonReinstallablePkgs ghcForComponent hsPkgs; };
 
   buildComp = componentId: component: comp-builder {
     inherit componentId component package name src flags setup cabalFile cabal-generator patches revision

builder/with-package-wrapper.nix renamed to builder/ghc-for-component-wrapper.nix

@@ -1,12 +1,16 @@
-# This is a simplified version of the ghcWithPackages wrapper in
-# nixpkgs, adapted to work with the package database of a single
-# component.
+# The ghcForComponent function wraps ghc so that it is configured with
+# the package database of all dependencies of a given component.
+# It has been adapted from the ghcWithPackages wrapper in nixpkgs.
+#
+# This wrapper exists so that nix-shells for components will have a
+# GHC automatically configured with the dependencies in the package
+# database.
+
 { lib, stdenv, ghc, runCommand, lndir, makeWrapper
 }:
 
-{ package
-, configFiles
-, postBuild ? ""
+{ componentName  # Full derivation name of the component
+, configFiles    # The component's "config" derivation
 }:
 
 let
@@ -18,12 +22,11 @@ let
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
 
-in runCommand "${ghc.name}-for-${package.identifier.name}" {
+in runCommand "${componentName}-${ghc.name}" {
   preferLocalBuild = true;
   passthru = {
     inherit (ghc) version meta;
     baseGhc = ghc;
-    inherit package;
   };
 } (
   ''

modules/component-driver.nix

@@ -6,10 +6,10 @@ let
     ghc = config.ghc.package;
     buildGHC = buildModules.config.ghc.package;
     inherit (config) nonReinstallablePkgs hsPkgs;
-    inherit withPackage;
+    inherit ghcForComponent;
   };
 
-  withPackage = import ../builder/with-package-wrapper.nix {
+  ghcForComponent = import ../builder/ghc-for-component-wrapper.nix {
     inherit lib;
     inherit (pkgs.buildPackages) stdenv runCommand makeWrapper;
     inherit (pkgs.buildPackages.xorg) lndir;