Add prebuilt-depends for proprietary dependencies.

Author: shlevy

builder/comp-builder.nix

@@ -90,6 +90,8 @@
 # LLVM
 , useLLVM ? ghc.useLLVM or false
 , smallAddressSpace ? false
+
+, prebuilt-depends ? []
 }:
 # makeOverridable is called here after all the `? DEFAULT` arguments
 # will have been applied.  This makes sure that `c.override (oldAttrs: {...})`
@@ -160,6 +162,7 @@ let self =
 , enableTSanRTS
 , useLLVM
 , smallAddressSpace
+, prebuilt-depends
 }@drvArgs:
 
 let
@@ -213,7 +216,7 @@ let
   configFiles = makeConfigFiles {
     component = componentForSetup;
     inherit (package) identifier;
-    inherit fullName flags needsProfiling enableDWARF;
+    inherit fullName flags needsProfiling enableDWARF prebuilt-depends;
   };
 
   enableFeature = enable: feature:
@@ -852,5 +855,6 @@ in drv; in self) {
           enableDWARF
           enableTSanRTS
           useLLVM
-          smallAddressSpace;
+          smallAddressSpace
+          prebuilt-depends;
 }

builder/hspkg-builder.nix

@@ -58,6 +58,7 @@ let
     inherit allComponent componentId component package name src flags setup cabalFile cabal-generator patches
             shellHook
             ;
+    inherit (config) prebuilt-depends;
   };
 
 in rec {

builder/make-config-files.nix

@@ -1,6 +1,6 @@
 { stdenv, lib, haskellLib, ghc, nonReinstallablePkgs, runCommand, writeText, writeScript }@defaults:
 
-{ identifier, component, fullName, flags ? {}, needsProfiling ? false, enableDWARF ? false, chooseDrv ? drv: drv, nonReinstallablePkgs ? defaults.nonReinstallablePkgs }:
+{ identifier, component, fullName, flags ? {}, needsProfiling ? false, enableDWARF ? false, chooseDrv ? drv: drv, nonReinstallablePkgs ? defaults.nonReinstallablePkgs, prebuilt-depends ? [] }:
 
 let
   # Sort and remove duplicates from nonReinstallablePkgs.
@@ -57,7 +57,7 @@ let
       ((if needsProfiling then (x: map (p: p.profiled or p) x) else x: x)
       (map haskellLib.dependToLib component.depends))
     )
-  );
+  ) ++ prebuilt-depends;
   script = ''
     ${target-pkg} init $configFiles/${packageCfgDir}
 
@@ -149,17 +149,6 @@ let
       echo "allow-older: ${identifier.name}:*" >> $configFiles/cabal.config
     ''}
 
-    for p in "''${pkgsHostTarget[@]}"; do
-      if [ -e $p/envDep ]; then
-        cat $p/envDep >> $configFiles/ghc-environment
-      fi
-      ${ lib.optionalString component.doExactConfig ''
-        if [ -d $p/exactDep ]; then
-          cat $p/exactDep/configure-flags >> $configFiles/configure-flags
-          cat $p/exactDep/cabal.config >> $configFiles/cabal.config
-        fi
-      ''}
-    done
     for p in ${lib.concatStringsSep " " nonReinstallablePkgs'}; do
       if [ -e $ghcDeps/envDeps/$p ]; then
         cat $ghcDeps/envDeps/$p >> $configFiles/ghc-environment
@@ -172,6 +161,18 @@ let
         cat $ghcDeps/exactDeps/$p/cabal.config >> $configFiles/cabal.config
       fi
     done
+  '' + ''
+    for p in "''${pkgsHostTarget[@]}"; do
+      if [ -e $p/envDep ]; then
+        cat $p/envDep >> $configFiles/ghc-environment
+      fi
+      ${ lib.optionalString component.doExactConfig ''
+        if [ -d $p/exactDep ]; then
+          cat $p/exactDep/configure-flags >> $configFiles/configure-flags
+          cat $p/exactDep/cabal.config >> $configFiles/cabal.config
+        fi
+      ''}
+    done
   ''
   # This code originates in the `generic-builder.nix` from nixpkgs.  However GHC has been fixed
   # to drop unused libraries referenced from libraries; and this patch is usually included in the

lib/call-cabal-project-to-nix.nix

@@ -62,6 +62,7 @@
 , evalPackages
 , supportHpack ? false      # Run hpack on package.yaml files with no .cabal file
 , ignorePackageYaml ? false # Ignore package.yaml files even if they exist
+, prebuilt-depends ? []
 , ...
 }@args:
 let
@@ -371,6 +372,7 @@ let
   };
 
   dummy-ghc-pkg-dump = evalPackages.runCommand "dummy-ghc-pkg-dump" {
+      buildInputs = prebuilt-depends;
       nativeBuildInputs = [
         evalPackages.haskell-nix.nix-tools-unchecked.exes.cabal2json
         evalPackages.jq
@@ -535,6 +537,15 @@ let
                 LAST_PKG="ghcjs-th"
               ''
           }
+          for l in "''${pkgsHostTarget[@]}"; do
+            if [ -d "$l/package.conf.d" ]; then
+              files=("$l/package.conf.d/"*.conf)
+              for file in "''${files[@]}"; do
+                 cat "$file" >> $out
+                 echo '---' >> $out
+              done
+            fi
+          done
           for pkg in $PKGS; do
             varname="$(echo $pkg | tr "-" "_")"
             ver="VER_$varname"

modules/cabal-project.nix

@@ -144,5 +144,10 @@ in {
       type = nullOr (listOf unspecified);
       default = [];
     };
+    prebuilt-depends = mkOption {
+      type = listOf package;
+      default = [];
+      description = "pre-built (perhaps proprietary) Haskell packages to make available as dependencies";
+    };
   };
 }

modules/component-driver.nix

@@ -37,6 +37,11 @@ in
     default = [];
     description = "pkgs to globally provide to Setup.hs builds";
   };
+  options.prebuilt-depends = lib.mkOption {
+    type = lib.types.listOf lib.types.package;
+    default = [];
+    description = "pre-built (perhaps proprietary) Haskell packages to make available as dependencies";
+  };
 
   # Dependencies (with reinstallable-lib:ghc)
   #

overlays/haskell.nix

@@ -699,6 +699,7 @@ final: prev: {
                         in if ghc.isHaskellNixCompiler or false then ghc.override { ghcEvalPackages = evalPackages; } else ghc;
                       compiler.nix-name = final.lib.mkForce config.compiler-nix-name;
                       evalPackages = final.lib.mkDefault evalPackages;
+                      inherit (config) prebuilt-depends;
                     } ];
                   extra-hackages = config.extra-hackages or [] ++ callProjectResults.extra-hackages;
                 };