@@ -1,5 +1,5 @@
11{-# LANGUAGE OverloadedStrings #-}
2−{-# LANGUAGE RankNTypes #-}
2+{-# LANGUAGE Rank2Types #-}
33{-# LANGUAGE TemplateHaskell #-}
44
55module Distribution.Nixpkgs.Haskell.Stack.PrettyPrinting where
@@ -15,22 +15,21 @@ import qualified Language.Nix.FilePath as Nix
1515import Language.Nix.PrettyPrinting as PP
1616
1717data OverrideConfig = OverrideConfig
18− { _ocGhc :: String
18+ { _ocGhc :: String
1919 , _ocStackagePackages :: Maybe FilePath
20− , _ocStackageConfig :: Maybe FilePath
21− }
20+ , _ocStackageConfig :: Maybe FilePath }
2221
2322makeLenses ''OverrideConfig
2423
25−hasField :: Lens' OverrideConfig (Maybe a) -> OverrideConfig -> Bool
24+hasField :: Lens' a (Maybe b) -> a -> Bool
2625hasField p = views p isJust
2726
2827overridePackages :: [Derivation] -> Doc
29−overridePackages deps = PP.packageSetConfig . PP.cat $ callPackage <$> deps
28+overridePackages = PP.packageSetConfig . PP.cat . fmap callPackage
3029 where
31− drvNameString = PP.doubleQuotes . disp . pkgName . view pkgid
30+ drvNameQuoted = PP.doubleQuotes . disp . pkgName . view pkgid
3231 callPackage drv = hang
33− (drvNameString drv <> " = callPackage") 2
32+ (drvNameQuoted drv <> " = callPackage") 2
3433 (PP.parens (PP.pPrint drv) <+> "{};")
3534
3635importStackagePackages :: FilePath -> Doc