Cleanup

Author: alexfmpe

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

@@ -42,7 +42,7 @@ instance Monoid BuildInfo where
 instance NFData BuildInfo
 
 pPrintBuildInfo :: String -> BuildInfo -> Doc
-pPrintBuildInfo prefix bi = vcat
+pPrintBuildInfo prefix bi = onlyIf (bi /= mempty) $ vcat
   [ setattr (prefix++"HaskellDepends") empty (setOf (haskell.folded.localName.ident) bi)
   , setattr (prefix++"SystemDepends")  empty (setOf (system.folded.localName.ident) bi)
   , setattr (prefix++"PkgconfigDepends") empty (setOf (pkgconfig.folded.localName.ident) bi)

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

@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE FlexibleInstances, MultiParamTypeClasses #-}
 
 module Distribution.Nixpkgs.Haskell.Derivation
@@ -102,7 +103,7 @@ nullDerivation = MkDerivation
 
 makeLenses ''Derivation
 
-makeLensesFor [("_setupDepends", "dependencies"), ("_libraryDepends", "dependencies"), ("_executableDepends", "dependencies"), ("_testDepends", "dependencies"), ("_benchmarkDepends", "dependencies")] ''Derivation
+makeLensesFor (fmap (,"dependencies") ["_setupDepends", "_libraryDepends", "_executableDepends", "_testDepends", "_benchmarkDepends"]) ''Derivation
 
 instance Package Derivation where
   packageId = view pkgid
@@ -123,11 +124,11 @@ instance Pretty Derivation where
       , boolattr "isLibrary" (not _isLibrary || _isExecutable) _isLibrary
       , boolattr "isExecutable" (not _isLibrary || _isExecutable) _isExecutable
       , boolattr "enableSeparateDataOutput" _enableSeparateDataOutput _enableSeparateDataOutput
-      , onlyIf (_setupDepends /= mempty) $ pPrintBuildInfo "setup" _setupDepends
-      , onlyIf (_libraryDepends /= mempty) $ pPrintBuildInfo "library" _libraryDepends
-      , onlyIf (_executableDepends /= mempty) $ pPrintBuildInfo "executable" _executableDepends
-      , onlyIf (_testDepends /= mempty) $ pPrintBuildInfo "test" _testDepends
-      , onlyIf (_benchmarkDepends /= mempty) $ pPrintBuildInfo "benchmark" _benchmarkDepends
+      , pPrintBuildInfo "setup" _setupDepends
+      , 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

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

@@ -124,10 +124,10 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
     & isExecutable .~ not (null executables)
     & extraFunctionArgs .~ mempty
     & extraAttributes .~ mempty
-    & libraryDepends .~ foldMap (convertBuildInfo . libBuildInfo) (maybeToList library ++ subLibraries)
-    & executableDepends .~ mconcat (map (convertBuildInfo . buildInfo) executables)
-    & testDepends .~ mconcat (map (convertBuildInfo . testBuildInfo) testSuites)
-    & benchmarkDepends .~ mconcat (map (convertBuildInfo . benchmarkBuildInfo) benchmarks)
+    & libraryDepends .~ deps libBuildInfo (maybeToList library ++ subLibraries)
+    & executableDepends .~ deps buildInfo executables
+    & testDepends .~ deps testBuildInfo testSuites
+    & benchmarkDepends .~ deps benchmarkBuildInfo benchmarks
     & Nix.setupDepends .~ maybe mempty convertSetupBuildInfo setupBuildInfo
     & configureFlags .~ mempty
     & cabalFlags .~ flags
@@ -163,6 +163,9 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
                      & Nix.broken .~ not (null missingDeps)
                      )
   where
+    deps :: (a -> Cabal.BuildInfo) -> [a] -> Nix.BuildInfo
+    deps getBuildInfo = foldMap (convertBuildInfo . getBuildInfo)
+
     xrev = maybe 0 read (lookup "x-revision" customFieldsPD)
 
     nixLicense :: Nix.License

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

@@ -4,7 +4,6 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize ) where
 
 import Control.Lens
 import qualified Data.Set as Set
-import Data.String
 import Distribution.Nixpkgs.Haskell
 import Distribution.Nixpkgs.Haskell.FromCabal.Name (toNixName)
 import Distribution.Nixpkgs.Meta
@@ -13,12 +12,14 @@ import Language.Nix hiding ( quote )
 
 normalize :: Derivation -> Derivation
 normalize drv = drv
-  & over libraryDepends (normalizeBuildInfo (packageName drv))
-  & over executableDepends (normalizeBuildInfo (packageName drv))
-  & over testDepends (normalizeBuildInfo (packageName drv))
-  & over benchmarkDepends (normalizeBuildInfo (packageName drv))
+  & deps libraryDepends
+  & deps executableDepends
+  & deps testDepends
+  & deps benchmarkDepends
   & over metaSection normalizeMeta
   & jailbreak %~ (&& (packageName drv /= "jailbreak-cabal"))
+  where
+    deps f = over f $ normalizeBuildInfo (packageName drv)
 
 normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
 normalizeBuildInfo pname bi = bi

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

@@ -4,7 +4,6 @@
 module Distribution.Nixpkgs.Haskell.FromCabal.PostProcess ( postProcess, pkg ) where
 
 import Control.Lens
-import Control.Monad.Trans.State
 import Data.List.Split
 import Data.Map ( Map )
 import qualified Data.Map as Map
@@ -58,17 +57,20 @@ fixGtkBuilds drv = drv & dependencies . pkgconfig %~ Set.filter (not . collidesW
 -- also work for Stack). Until that changes, we provide do this to work around
 -- those package's brokenness.
 fixBuildDependsForTools :: Derivation -> Derivation
-fixBuildDependsForTools = foldr (.) id
-  [ fmap snd $ runState $ do
-      needs <- use $ cloneLens c . haskell . contains p
-      cloneLens c . tool . contains p ||= needs
-  | (c :: ALens' Derivation BuildInfo) <- [ testDepends, benchmarkDepends ]
-  , p <- self <$> [ "hspec-discover"
-                  , "tasty-discover"
-                  , "hsx2hs"
-                  , "markdown-unlit"
-                  ]
-  ]
+fixBuildDependsForTools = foldr (.) id $ fmap go [ testDepends, benchmarkDepends ]
+  where
+    go c drv =
+      over (l . tool) (Set.union needed) drv
+      where
+        l :: Lens' Derivation BuildInfo
+        l = cloneLens c
+        needed = Set.intersection executables $ view (l . haskell) drv
+        executables = Set.fromList $ self <$>
+          [ "hspec-discover"
+          , "tasty-discover"
+          , "hsx2hs"
+          , "markdown-unlit"
+          ]
 
 hooks :: [(PackageVersionConstraint, Derivation -> Derivation)]
 hooks =