Preserve per-component build info until pretty-printing

Author: alexfmpe

cabal2nix/src/Cabal2nix.hs

@@ -175,7 +175,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() ->
 
 hpackOverrides :: Derivation -> Derivation
 hpackOverrides = over phaseOverrides (++ "prePatch = \"hpack\";")
-               . set (libraryDepends . tool . contains (PP.pkg "hpack")) True
+               . set (focusBuildInfo libraryDepends . tool . contains (PP.pkg "hpack")) True
 
 cabal2nix' :: Options -> IO (Either Doc Derivation)
 cabal2nix' opts@Options{..} = do

cabal2nix/src/Distribution/Nixpkgs/Haskell/Derivation.hs

@@ -1,4 +1,6 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TupleSections #-}
@@ -10,11 +12,15 @@ module Distribution.Nixpkgs.Haskell.Derivation
   , cabalFlags, runHaddock, jailbreak, doCheck, doBenchmark, testFlags, testTargets, hyperlinkSource
   , enableLibraryProfiling, enableExecutableProfiling, phaseOverrides, editedCabalFile, metaSection
   , dependencies, setupDepends, benchmarkDepends, enableSeparateDataOutput, extraAttributes
+  , focusBuildInfo
   )
   where
 
 import Prelude hiding ((<>))
 
+#if !MIN_VERSION_base(4,18,0)
+import Control.Applicative (liftA2)
+#endif
 import Control.DeepSeq
 import Control.Lens
 import Data.List ( isPrefixOf )
@@ -47,10 +53,10 @@ data Derivation = MkDerivation
   , _extraFunctionArgs          :: Set Binding
   , _extraAttributes            :: Map String String
   , _setupDepends               :: BuildInfo
-  , _libraryDepends             :: BuildInfo
-  , _executableDepends          :: BuildInfo
-  , _testDepends                :: BuildInfo
-  , _benchmarkDepends           :: BuildInfo
+  , _libraryDepends             :: [(BuildInfo, Bool)]
+  , _executableDepends          :: [(BuildInfo, Bool)]
+  , _testDepends                :: [(BuildInfo, Bool)]
+  , _benchmarkDepends           :: [(BuildInfo, Bool)]
   , _configureFlags             :: Set String
   , _cabalFlags                 :: FlagAssignment
   , _runHaddock                 :: Bool
@@ -103,7 +109,14 @@ nullDerivation = MkDerivation
 
 makeLenses ''Derivation
 
-makeLensesFor (fmap (,"dependencies") ["_setupDepends", "_libraryDepends", "_executableDepends", "_testDepends", "_benchmarkDepends"]) ''Derivation
+makeLensesFor (fmap (,"nonSetupDependencies") ["_libraryDepends", "_executableDepends", "_testDepends", "_benchmarkDepends"]) ''Derivation
+
+dependencies :: Traversal' Derivation BuildInfo
+dependencies = traversal $ \focus drv ->
+  liftA2 (set setupDepends) (focus $ view setupDepends drv) ((nonSetupDependencies . traverse . _1) focus drv)
+
+focusBuildInfo :: Lens' Derivation [(BuildInfo, Bool)] -> Traversal' Derivation BuildInfo
+focusBuildInfo l = l . traverse . _1
 
 instance Package Derivation where
   packageId = view pkgid
@@ -125,10 +138,10 @@ instance Pretty Derivation where
       , boolattr "isExecutable" (not _isLibrary || _isExecutable) _isExecutable
       , boolattr "enableSeparateDataOutput" _enableSeparateDataOutput _enableSeparateDataOutput
       , pPrintBuildInfo "setup" _setupDepends
-      , pPrintBuildInfo "library" _libraryDepends
-      , pPrintBuildInfo "executable" _executableDepends
-      , pPrintBuildInfo "test" _testDepends
-      , pPrintBuildInfo "benchmark" _benchmarkDepends
+      , pPrintBuildInfo' "library" _libraryDepends
+      , pPrintBuildInfo' "executable" _executableDepends
+      , pPrintBuildInfo' "test" _testDepends
+      , pPrintBuildInfo' "benchmark" _benchmarkDepends
       , boolattr "enableLibraryProfiling" _enableLibraryProfiling _enableLibraryProfiling
       , boolattr "enableExecutableProfiling" _enableExecutableProfiling _enableExecutableProfiling
       , boolattr "doHaddock" (not _runHaddock) _runHaddock
@@ -145,6 +158,9 @@ instance Pretty Derivation where
     , rbrace
     ]
     where
+      pPrintBuildInfo' :: String -> [(BuildInfo, Bool)] -> Doc
+      pPrintBuildInfo' name = pPrintBuildInfo name . foldMap fst . filter snd
+
       inputs :: Set String
       inputs = Set.unions [ Set.map (view (localName . ident)) _extraFunctionArgs
                           , setOf (dependencies . each . folded . localName . ident) drv

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
 
 module Distribution.Nixpkgs.Haskell.FromCabal
   ( HaskellResolver, NixpkgsResolver
@@ -163,8 +164,8 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
                      & Nix.broken .~ not (null missingDeps)
                      )
   where
-    deps :: (a -> Cabal.BuildInfo) -> [a] -> Nix.BuildInfo
-    deps getBuildInfo = foldMap (convertBuildInfo . getBuildInfo)
+    deps :: (a -> Cabal.BuildInfo) -> [a] -> [(Nix.BuildInfo, Bool)]
+    deps getBuildInfo = map (convertBuildInfo . getBuildInfo)
 
     xrev = maybe 0 read (lookup "x-revision" customFieldsPD)
 
@@ -211,9 +212,8 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
                    | Just l <- library           = not (null (exposedModules l))
                    | otherwise                   = True
 
-    convertBuildInfo :: Cabal.BuildInfo -> Nix.BuildInfo
-    convertBuildInfo Cabal.BuildInfo {..} | not buildable = mempty
-    convertBuildInfo Cabal.BuildInfo {..} = mempty
+    convertBuildInfo :: Cabal.BuildInfo -> (Nix.BuildInfo, Bool)
+    convertBuildInfo Cabal.BuildInfo {..} = (, buildable) $ mempty
       & haskell .~ Set.fromList [ resolveInHackage (toNixName x) | (Dependency x _ _) <- targetBuildDepends, x `notElem` internalLibNames ]
       & system .~ Set.fromList [ resolveInNixpkgs y | x <- extraLibs, y <- libNixName x ]
       & pkgconfig .~ Set.fromList [ resolveInNixpkgs y | PkgconfigDependency x _ <- pkgconfigDepends, y <- libNixName (unPkgconfigName x) ]

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs

@@ -1,4 +1,6 @@
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RankNTypes #-}
 
 module Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize ) where
 
@@ -19,7 +21,8 @@ normalize drv = drv
   & over metaSection normalizeMeta
   & jailbreak %~ (&& (packageName drv /= "jailbreak-cabal"))
   where
-    deps f = over f $ normalizeBuildInfo (packageName drv)
+    deps :: Lens' Derivation [(BuildInfo, Bool)] -> Derivation -> Derivation
+    deps f = over (focusBuildInfo f) $ normalizeBuildInfo (packageName drv)
 
 normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
 normalizeBuildInfo pname bi = bi