Add support for "hide" yesodweb/wai#579

ChangeLog.md

@@ -1,3 +1,7 @@
+## 0.14.5
+
+* Add support for the `hide` field [yesodweb/wai#579](https://github.com/yesodweb/wai/issues/579)
+
 ## 0.14.4.1
 
 * A few missing fixes

Stackage/BuildConstraints.hs

@@ -22,6 +22,7 @@ import           Control.Monad.Writer.Strict (execWriter, tell)
 import           Data.Aeson
 import           Data.Aeson.Internal         ((<?>), JSONPathElement (Key))
 import qualified Data.Map                    as Map
+import qualified Data.Set                    as Set
 import           Data.Yaml                   (decodeEither', decodeFileEither)
 import           Distribution.Package        (Dependency (..))
 import qualified Distribution.System
@@ -125,6 +126,8 @@ data ConstraintFile = ConstraintFile
     , cfGhcMajorVersion         :: Maybe (Int, Int)
     , cfTreatAsNonCore          :: Set PackageName
     , cfTellMeWhenItsReleased   :: Map PackageName Version
+    , cfHide                    :: Set PackageName
+    -- ^ Packages which should be hidden after registering
     }
 
 instance FromJSON ConstraintFile where
@@ -148,6 +151,7 @@ instance FromJSON ConstraintFile where
         cfTreatAsNonCore <- getPackages o "treat-as-non-core" <|> return mempty
         cfTellMeWhenItsReleased <- (fmap mconcat $ o .: "tell-me-when-its-released" >>= mapM toNameVerMap)
                                <?> Key "tell-me-when-its-released"
+        cfHide <- Set.map PackageName <$> o .:? "hide" .!= mempty
         return ConstraintFile {..}
       where
         goFlagMap = Map.mapKeysWith const FlagName
@@ -222,6 +226,7 @@ toBC ConstraintFile {..} = do
         pcFlagOverrides = fromMaybe mempty $ lookup name cfPackageFlags
         pcConfigureArgs = fromMaybe mempty $ lookup name cfConfigureArgs
         pcSkipBuild = name `member` cfSkippedBuilds
+        pcHide = name `member` cfHide
 
     bcGithubUsers = cfGithubUsers
     bcBuildToolOverrides = cfBuildToolOverrides

Stackage/PerformBuild.hs

@@ -410,6 +410,14 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} = do
             Nothing -> rest
             Just db -> ("-package-db=" ++ pack db) : rest)
 
+    ghcPkgArgs :: [Text] -> [Text]
+    ghcPkgArgs rest =
+          "--package-db=clear"
+        : "--package-db=global"
+        : (case pbDatabase pb of
+            Nothing -> rest
+            Just db -> ("--package-db=" ++ pack db) : rest)
+
     configArgs = ($ []) $ execWriter $ do
         tell' "--package-db=clear"
         tell' "--package-db=global"
@@ -497,16 +505,19 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} = do
                         ]
                     return True
                 | otherwise -> return False
-        when toBuild $ withConfiged $ \_childDir cabal -> do
+        when toBuild $ withConfiged $ \childDir cabal -> do
             deletePreviousResults pb pident
 
             log' $ "Building " ++ namever
             cabal ["build"]
 
             log' $ "Copying/registering " ++ namever
             cabal ["copy"]
-            withMVar sbRegisterMutex $ const $
+            withMVar sbRegisterMutex $ const $ do
                 cabal ["register"]
+                when pcHide $ do
+                    log' $ "Hiding " ++ namever
+                    runIn childDir getOutH "ghc-pkg" $ ghcPkgArgs ["hide", namever]
 
             savePreviousResult pb Build pident True
 

Stackage/Types.hs

@@ -254,6 +254,9 @@ data PackageConstraints = PackageConstraints
     -- ^ Don't even bother building this library, useful when dealing with
     -- OS-specific packages. See:
     -- https://github.com/fpco/stackage-curator/issues/3
+    , pcHide             :: !Bool
+    -- ^ Hide this package after registering, useful for avoiding
+    -- module name conflicts
     }
     deriving (Show, Eq)
 instance ToJSON PackageConstraints where
@@ -291,6 +294,7 @@ instance FromJSON PackageConstraints where
         pcEnableLibProfile <- fmap (fromMaybe True) (o .:? "library-profiling")
         pcSkipBuild <- o .:? "skip-build" .!= False
         pcConfigureArgs <- o .:? "configure-args" .!= mempty
+        pcHide <- o .:? "hide" .!= False
         return PackageConstraints {..}
 
 data TestState = ExpectSuccess

Stackage/UpdateBuildPlan.hs

@@ -42,6 +42,7 @@ updateBuildConstraints BuildPlan {..} =
         , pcFlagOverrides = maybe mempty pcFlagOverrides moldPC
         , pcEnableLibProfile = maybe True pcEnableLibProfile moldPC
         , pcSkipBuild = maybe False pcSkipBuild moldPC
+        , pcHide = maybe False pcHide moldPC
         }
       where
         moldBP = lookup name bpPackages

stackage-curator.cabal

@@ -1,5 +1,5 @@
 name:                stackage-curator
-version:             0.14.4.1
+version:             0.14.5
 synopsis:            Tools for curating Stackage bundles
 description:         Please see <http://www.stackage.org/package/stackage-curator> for a description and documentation.
 homepage:            https://github.com/fpco/stackage-curator