Use pkgsBuildBuild instead of buildPackages in Cabal2Nix

input-output-hk · Jul 18, 2024 · 7f87291 · 7f87291
1 parent 7bcd019
commit 7f87291
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/modules/component-driver.nix b/modules/component-driver.nix
@@ -116,7 +116,8 @@ in
 
   config.hsPkgs =
     { inherit (builder) shellFor makeConfigFiles ghcWithPackages ghcWithHoogle;
-      buildPackages = buildModules.config.hsPkgs;
+      buildPackages = buildModules.config.hsPkgs; # TODO perhaps remove this
+      pkgsBuildBuild = buildModules.config.hsPkgs;
     } //
     lib.mapAttrs
       (_name: pkg: if pkg == null then null else builder.build-package config pkg)

diff --git a/nix-tools/nix-tools/lib/Cabal2Nix.hs b/nix-tools/nix-tools/lib/Cabal2Nix.hs
@@ -403,14 +403,14 @@ instance ToNixExpr SetupDependency where
   toNix (SetupDependency pkgName' LMainLibName) =
       -- TODO once https://github.com/haskell-nix/hnix/issues/52
       -- is reolved use something like:
-      -- [nix| hsPkgs.buildPackages.$((pkgName)) or pkgs.buildPackages.$((pkgName)) ]
+      -- [nix| hsPkgs.pkgsBuildBuild.$((pkgName)) or pkgs.pkgsBuildBuild.$((pkgName)) ]
       selectOr (mkSym hsPkgs) buildPackagesDotName
         (selectOr (mkSym pkgs) buildPackagesDotName (mkSym errorHandler @. setupDepError @@ mkStr pkg))
     where
       pkg = fromString . show . pretty $ pkgName'
-      buildPackagesDotName = mkSelector "buildPackages" <> mkSelector pkg
+      buildPackagesDotName = mkSelector "pkgsBuildBuild" <> mkSelector pkg
   toNix (SetupDependency pkgName' (LSubLibName l)) = selectOr (mkSym hsPkgs) (
-             mkSelector "buildPackages"
+             mkSelector "pkgsBuildBuild"
           <> mkSelector (quoted pkg)
           <> mkSelector "components"
           <> mkSelector "sublibs"
@@ -423,12 +423,12 @@ instance ToNixExpr SetupDependency where
 instance ToNixExpr BuildToolDependency where
   toNix (BuildToolDependency pkgName' componentName') =
       selectOr (mkSym hsPkgs) (
-             mkSelector "buildPackages"
+             mkSelector "pkgsBuildBuild"
           <> mkSelector pkg
           <> mkSelector "components"
           <> mkSelector "exes"
           <> mkSelector componentName)
-        (selectOr (mkSym pkgs) (mkSelector "buildPackages" <> mkSelector componentName)
+        (selectOr (mkSym pkgs) (mkSelector "pkgsBuildBuild" <> mkSelector componentName)
           (mkSym errorHandler @. buildToolDepError @@ mkStr (pkg <> ":" <> componentName)))
     where
       pkg = fromString . show . pretty $ pkgName'

diff --git a/package-set.nix b/package-set.nix
@@ -1,5 +1,5 @@
 let f = { hackage, pkgs, pkg-def, pkg-def-extras ? [], modules ? [] }: let
-  buildModules = f { inherit hackage pkg-def pkg-def-extras modules; pkgs = pkgs.buildPackages; };
+  buildModules = f { inherit hackage pkg-def pkg-def-extras modules; pkgs = pkgs.pkgsBuildBuild; };
 in pkgs.lib.evalModules {
   modules = modules ++ [
     ({ config, lib, ... }: {