Merge pull request commercialhaskell#4814 from commercialhaskell/cleanup-pantry-exports

Basic pantry package cleanup

Author: borsboom

src/Stack/Config.hs

@@ -34,7 +34,7 @@ module Stack.Config
 
 import           Control.Monad.Extra (firstJustM)
 import           Stack.Prelude
-import           Data.Aeson.Extended
+import           Pantry.Internal.AesonExtended
 import qualified Data.ByteString as S
 import           Data.ByteString.Builder (byteString)
 import           Data.Coerce (coerce)
@@ -578,7 +578,7 @@ fillProjectWanted stackYamlFP config project locCache snapCompiler snapPackages
       (pl, mCompleted) <- case rpl of
          RPLImmutable rpli -> do
            compl <- maybe (completePackageLocation rpli) pure (Map.lookup rpli locCache)
-           pure (PLImmutable compl, Just (rpli, compl))
+           pure (PLImmutable compl, Just (CompletedPLI rpli compl))
          RPLMutable p ->
            pure (PLMutable p, Nothing)
       dp <- additionalDepPackage (shouldHaddockDeps bopts) pl

src/Stack/Docker.hs

@@ -26,7 +26,7 @@ module Stack.Docker
 
 import           Stack.Prelude
 import qualified Crypto.Hash as Hash (Digest, MD5, hash)
-import           Data.Aeson.Extended (FromJSON(..),(.:),(.:?),(.!=),eitherDecode)
+import           Pantry.Internal.AesonExtended (FromJSON(..),(.:),(.:?),(.!=),eitherDecode)
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.ByteString.Lazy as BL
 import qualified Data.ByteString.Lazy.Char8 as LBS

src/Stack/Lock.hs

@@ -10,7 +10,7 @@ module Stack.Lock
     , Locked(..)
     ) where
 
-import Data.Aeson.Extended
+import Pantry.Internal.AesonExtended
 import Data.ByteString.Builder (byteString)
 import qualified Data.List.NonEmpty as NE
 import Data.Map (Map)
@@ -122,9 +122,11 @@ lockCachedWanted stackFile resolver fillWanted = do
     let compiler = snapshotCompiler snap
         snPkgs = Map.mapWithKey (\n p h -> snapToDepPackage h n p) (snapshotPackages snap)
     (wanted, prjCompleted) <- fillWanted Map.empty compiler snPkgs
-    let lockLocations = map (uncurry LockedLocation)
-        differentSnapLocs (raw, complete) = raw /= toRawSL complete
-        newLocked = Locked { lckSnapshotLocations = lockLocations $ filter differentSnapLocs slocCompleted
+    let lockLocations = map (\(CompletedPLI r c) -> LockedLocation r c)
+        differentSnapLocs (CompletedSL raw complete)
+          | raw == toRawSL complete = Nothing
+          | otherwise = Just $ LockedLocation raw complete
+        newLocked = Locked { lckSnapshotLocations = mapMaybe differentSnapLocs slocCompleted
                            , lckPkgImmutableLocations =
                              lockLocations $ pliCompleted <> prjCompleted
                            }

src/Stack/Setup.hs

@@ -33,7 +33,7 @@ import              Conduit
 import              Control.Applicative (empty)
 import              Control.Monad.State (get, put, modify)
 import "cryptonite" Crypto.Hash (SHA1(..), SHA256(..))
-import              Data.Aeson.Extended
+import              Pantry.Internal.AesonExtended
 import qualified    Data.ByteString as S
 import qualified    Data.ByteString.Lazy as LBS
 import qualified    Data.Conduit.Binary as CB

src/Stack/Storage.hs

@@ -41,7 +41,7 @@ import Database.Persist.Sqlite
 import Database.Persist.TH
 import Distribution.Text (simpleParse, display)
 import Foreign.C.Types (CTime (..))
-import qualified Pantry.SQLite as SQLite
+import qualified Pantry.Internal as SQLite
 import Path
 import Path.IO (resolveFile', resolveDir')
 import qualified RIO.FilePath as FP

src/Stack/Types/CompilerBuild.hs

@@ -7,7 +7,7 @@ module Stack.Types.CompilerBuild
   ) where
 
 import           Stack.Prelude
-import           Data.Aeson.Extended (FromJSON, parseJSON, withText)
+import           Pantry.Internal.AesonExtended (FromJSON, parseJSON, withText)
 import           Data.Text as T
 
 data CompilerBuild

src/Stack/Types/Config.hs

@@ -175,7 +175,7 @@ module Stack.Types.Config
 import           Control.Monad.Writer (tell)
 import           Crypto.Hash (hashWith, SHA1(..))
 import           Stack.Prelude
-import           Data.Aeson.Extended
+import           Pantry.Internal.AesonExtended
                  (ToJSON, toJSON, FromJSON, FromJSONKey (..), parseJSON, withText, object,
                   (.=), (..:), (...:), (..:?), (..!=), Value(Bool),
                   withObjectWarnings, WarningParser, Object, jsonSubWarnings,
@@ -210,7 +210,7 @@ import           Lens.Micro (Lens', lens, _1, _2, to)
 import           Options.Applicative (ReadM)
 import qualified Options.Applicative as OA
 import qualified Options.Applicative.Types as OA
-import           Pantry.SQLite (Storage)
+import           Pantry.Internal (Storage)
 import           Path
 import qualified Paths_stack as Meta
 import qualified RIO.List as List

src/Stack/Types/Config/Build.hs

@@ -30,7 +30,7 @@ module Stack.Types.Config.Build
     )
     where
 
-import           Data.Aeson.Extended
+import           Pantry.Internal.AesonExtended
 import qualified Data.Map.Strict as Map
 import           Generics.Deriving.Monoid (memptydefault, mappenddefault)
 import           Stack.Prelude

src/Stack/Types/Docker.hs

@@ -10,7 +10,7 @@
 module Stack.Types.Docker where
 
 import Stack.Prelude hiding (Display (..))
-import Data.Aeson.Extended
+import Pantry.Internal.AesonExtended
 import Data.List (intercalate)
 import qualified Data.Text as T
 import Distribution.System (Platform(..), OS(..), Arch(..))

src/Stack/Types/GhcPkgId.hs

@@ -14,7 +14,7 @@ module Stack.Types.GhcPkgId
   where
 
 import           Stack.Prelude
-import           Data.Aeson.Extended
+import           Pantry.Internal.AesonExtended
 import           Data.Attoparsec.Text
 import qualified Data.Text as T
 import           Database.Persist.Sql (PersistField, PersistFieldSql)