Fixes for shellFor and hoogle in shell

builder/comp-builder.nix

@@ -499,6 +499,7 @@ let
               if id=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" id --simple-output); then
                 name=$(${target-pkg-and-db} field "z-${package.identifier.name}-z-*" name --simple-output)
                 echo "--dependency=''${name#z-${package.identifier.name}-z-}=$id" >> $out/exactDep/configure-flags
+                echo "package-id $id" >> $out/envDep
                 ''
                 # Allow `package-name:sublib-name` to work in `build-depends`
                 # by adding the same `--dependency` again, but with the package

builder/default.nix

@@ -44,7 +44,11 @@ let
 
 
   hoogleLocal = let
-    nixpkgsHoogle = import (pkgs.path + /pkgs/development/haskell-modules/hoogle.nix);
+    # Use hoogle.nix from at least nixpkgs 22.05
+    nixpkgs = if lib.versionAtLeast lib.trivial.release "22.05"
+      then pkgs.path
+      else pkgs.haskell-nix.sources.nixpkgs-2205;
+    nixpkgsHoogle = import (nixpkgs + /pkgs/development/haskell-modules/hoogle.nix);
   in { packages ? [], hoogle ? pkgs.buildPackages.haskell-nix.tool "ghc8107" "hoogle" {
         inherit evalPackages;
         version = "5.0.18.3";
@@ -59,11 +63,9 @@ let
           else ghc;
         inherit packages hoogle;
       };
-    in if lib.versionAtLeast lib.trivial.release "22.05"
-      then haskellLib.weakCallPackage pkgs nixpkgsHoogle {
-          inherit haskellPackages;
-        } (p: p.packages)
-      else haskellLib.weakCallPackage pkgs nixpkgsHoogle haskellPackages;
+    in haskellLib.weakCallPackage pkgs nixpkgsHoogle {
+      inherit haskellPackages;
+    } (p: p.packages);
 
   # Same as haskellPackages.shellFor in nixpkgs.
   shellFor = haskellLib.weakCallPackage pkgs ./shell-for.nix {

builder/ghc-for-component-wrapper.nix

@@ -149,9 +149,11 @@ let
   passthru = {
     inherit (ghc) version meta;
   };
+  propagatedBuildInputs = configFiles.libDeps;
   nativeBuildInputs = [ghc];
 } (''
-    configFiles=$(mktemp -d)
+    mkdir -p $out/configFiles
+    configFiles=$out/configFiles
     ${configFiles.script}
     wrappedGhc=$out
     ${script}

builder/haddock-builder.nix

@@ -47,7 +47,7 @@ let
   finalConfigureFlags = lib.concatStringsSep " " (
     [ "--prefix=${componentDrv}"
       "${haskellLib.componentTarget componentId}"
-      "$(cat ${docsConfigFiles}/configure-flags)"
+      "$(cat $configFiles/configure-flags)"
     ]
     ++ commonConfigureFlags
     ++ lib.optional doHaddock' " --docdir=${docdir "$doc"}");
@@ -66,7 +66,7 @@ let
       configFiles = docsConfigFiles;
 
       # The directory containing the haddock documentation.
-      haddockDir = if doHaddock' then "${docdir drv.doc}/html" else null;
+      haddockDir = lib.const (if doHaddock' then "${docdir drv.doc}/html" else null);
     };
 
     # `out` contains the `package.conf.d` files used for building the
@@ -75,16 +75,22 @@ let
     outputs = ["out"]
     ++ lib.optional doHaddock' "doc";
 
-    propagatedBuildInputs = builtins.concatLists pkgconfig;
+    propagatedBuildInputs =
+         builtins.concatLists pkgconfig
+      ++ configFiles.libDeps;
 
-    buildInputs = component.libs
-      ++ map (d: d.components.library.haddock or d) component.depends;
+    buildInputs = component.libs;
 
     nativeBuildInputs =
-      [ shellWrappers buildPackages.removeReferencesTo ]
+      [ ghc buildPackages.removeReferencesTo ]
       ++ componentDrv.executableToolDepends;
 
     configurePhase = ''
+      configFiles=$(mktemp -d)
+      ${docsConfigFiles.script}
+      wrappedGhc=$(mktemp -d)
+      ${shellWrappers.script}
+      PATH=$wrappedGhc/bin:$PATH
       runHook preConfigure
       echo Configure flags:
       printf "%q " ${finalConfigureFlags}
@@ -145,7 +151,7 @@ let
           # working hyper links.
           pkg=$(basename "$i")
           sed -e "s|haddock-interfaces:.*|haddock-interfaces: $docdir/html/${componentId.cname}.haddock|" -e "s|haddock-html:.*|haddock-html: $docdir/html/|" "$i" > "$pkg"
-          ${ghc.targetPrefix}ghc-pkg -v0 --package-db ${docsConfigFiles}/${configFiles.packageCfgDir} -f $out/package.conf.d register "$pkg"
+          ${ghc.targetPrefix}ghc-pkg -v0 --package-db $configFiles/${configFiles.packageCfgDir} -f $out/package.conf.d register "$pkg"
         done
 
         ln -s ${componentDrv}/exactDep $out/exactDep

builder/hspkg-builder.nix

@@ -41,15 +41,17 @@ let
 
   setup = if package.buildType == "Simple"
     then ghc.defaultSetupFor package.identifier.name
-    else setup-builder {
+    else setup-builder ({
       component = components.setup // {
         depends = config.setup-depends ++ components.setup.depends ++ package.setup-depends;
         extraSrcFiles = components.setup.extraSrcFiles ++ [ "Setup.hs" "Setup.lhs" ];
         pkgconfig = if components ? library then components.library.pkgconfig or [] else [];
       };
       inherit package name src flags revision patches defaultSetupSrc;
       inherit (pkg) preUnpack postUnpack;
-    };
+    } // lib.optionalAttrs (package.buildType != "Custom") {
+      nonReinstallablePkgs = ["base" "Cabal"];
+    });
 
   buildComp = allComponent: componentId: component: comp-builder {
     inherit allComponent componentId component package name src flags setup cabalFile cabal-generator patches revision

builder/make-config-files.nix

@@ -128,7 +128,7 @@ let
       echo "allow-older: ${identifier.name}:*" >> $configFiles/cabal.config
     ''}
 
-    for p in $propagatedBuildInputs; do
+    for p in "''${pkgsHostTarget[@]}"; do
       if [ -e $p/envDep ]; then
         cat $p/envDep >> $configFiles/ghc-environment
       fi
@@ -203,6 +203,7 @@ let
   '';  
   drv = runCommand "${ghc.targetPrefix}${fullName}-config" {
       nativeBuildInputs = [ghc];
+      propagatedBuildInputs = libDeps;
     } (''
     mkdir -p $out
     configFiles=$out

builder/setup-builder.nix

@@ -82,7 +82,7 @@ let
           if [ -f $f ]; then
             echo Compiling package $f
             ghc $f -threaded ${if includeGhcPackage then "-package ghc " else ""
-                }-package-db $configFiles/${configFiles.packageCfgDir} --make -o ./Setup
+                }-package-env $configFiles/ghc-environment --make -o ./Setup
           fi
         done
         [ -f ./Setup ] || (echo Failed to build Setup && exit 1)

builder/shell-for.nix

@@ -124,7 +124,7 @@ let
     # hoogle.nix expects.
     docPackage = p: lib.getOutput "doc" p // {
       pname = p.identifier.name;
-      haddockDir = lib.const p.haddockDir;
+      haddockDir = p.haddockDir;
     };
   in hoogleLocal ({
     packages = map docPackage (haskellLib.flatLibDepends component);
@@ -149,7 +149,7 @@ in
 
     buildInputs = systemInputs
       ++ mkDrvArgs.buildInputs or [];
-    nativeBuildInputs = [ ghcEnv ]
+    nativeBuildInputs = [ ghcEnv.drv ]
       ++ nativeBuildInputs
       ++ mkDrvArgs.nativeBuildInputs or []
       ++ lib.attrValues (buildPackages.haskell-nix.tools' evalPackages compiler.nix-name tools)
@@ -178,7 +178,7 @@ in
 
     # This helps tools like `ghcide` (that use the ghc api) to find
     # the correct global package DB.
-    NIX_GHC_LIBDIR = ghcEnv + "/" + configFiles.libDir;
+    NIX_GHC_LIBDIR = ghcEnv.drv + "/" + configFiles.libDir;
 
     passthru = (mkDrvArgs.passthru or {}) // {
       ghc = ghcEnv;