Skip to content

Commit

Permalink
Merge pull request #4988 from commercialhaskell/casa-integration
Browse files Browse the repository at this point in the history
Integration with casa
  • Loading branch information
chrisdone authored Nov 20, 2019
2 parents e44a01e + ad15369 commit 665a184
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 4 deletions.
2 changes: 2 additions & 0 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ dependencies:
- open-browser
- optparse-applicative
- pantry >= 0.2
- casa-client
- casa-types
- path
- path-io
- persistent
Expand Down
8 changes: 7 additions & 1 deletion snapshot-lts-12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@ packages:
- rio-prettyprint-0.1.0.0@rev:0
- hi-file-parser-0.1.0.0@rev:0
- http-download-0.1.0.0@rev:0
- pantry-0.2.0.0
- github: commercialhaskell/pantry
commit: de8a0b5f88e9974fafb4a6ed5835d1da8f821d80
- github: fpco/casa
commit: fc0ed26858bfc4f2966ed2dfb2871bae9266dda6
subdirs:
- casa-client
- casa-types
- github: snoyberg/filelock
commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc

Expand Down
10 changes: 8 additions & 2 deletions snapshot-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ packages:
- persistent-template-2.7.1@rev:0
- persistent-2.10.0@rev:0
- persistent-sqlite-2.10.1@rev:0
- pantry-0.2.0.0
- github: commercialhaskell/pantry
commit: de8a0b5f88e9974fafb4a6ed5835d1da8f821d80
- github: fpco/casa
commit: fc0ed26858bfc4f2966ed2dfb2871bae9266dda6
subdirs:
- casa-client
- casa-types
- github: snoyberg/filelock
commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc

drop-packages:
# See https://github.com/commercialhaskell/stack/pull/4712
- cabal-install
8 changes: 7 additions & 1 deletion snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,15 @@ packages:
- rio-prettyprint-0.1.0.0@rev:0
- hi-file-parser-0.1.0.0@rev:0
- http-download-0.1.0.0@rev:0
- pantry-0.2.0.0
- github: snoyberg/filelock
commit: 97e83ecc133cd60a99df8e1fa5a3c2739ad007dc
- github: commercialhaskell/pantry
commit: de8a0b5f88e9974fafb4a6ed5835d1da8f821d80
- github: fpco/casa
commit: fc0ed26858bfc4f2966ed2dfb2871bae9266dda6
subdirs:
- casa-client
- casa-types

drop-packages:
# See https://github.com/commercialhaskell/stack/pull/4712
Expand Down
2 changes: 2 additions & 0 deletions src/Stack/Config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ configFromConfigMonoid
hsc
(maybe HpackBundled HpackCommand $ getFirst configMonoidOverrideHpack)
clConnectionCount
(fromFirst defaultCasaRepoPrefix configMonoidCasaRepoPrefix)
defaultCasaMaxPerRequest
(\configPantryConfig -> initUserStorage
(configStackRoot </> relFileStorage)
(\configUserStorage -> inner Config {..}))
Expand Down
7 changes: 7 additions & 0 deletions src/Stack/Types/Config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ import Stack.Types.Version
import qualified System.FilePath as FilePath
import System.PosixCompat.Types (UserID, GroupID, FileMode)
import RIO.Process (ProcessContext, HasProcessContext (..))
import Casa.Client (CasaRepoPrefix)

-- Re-exports
import Stack.Types.Config.Build as X
Expand Down Expand Up @@ -855,6 +856,7 @@ data ConfigMonoid =
-- ^ See 'configHideSourcePaths'
, configMonoidRecommendUpgrade :: !FirstTrue
-- ^ See 'configRecommendUpgrade'
, configMonoidCasaRepoPrefix :: !(First CasaRepoPrefix)
}
deriving (Show, Generic)

Expand Down Expand Up @@ -977,6 +979,8 @@ parseConfigMonoidObject rootDir obj = do
configMonoidHideSourcePaths <- FirstTrue <$> obj ..:? configMonoidHideSourcePathsName
configMonoidRecommendUpgrade <- FirstTrue <$> obj ..:? configMonoidRecommendUpgradeName

configMonoidCasaRepoPrefix <- First <$> obj ..:? configMonoidCasaRepoPrefixName

return ConfigMonoid {..}
where
handleExplicitSetupDep :: Monad m => (Text, Bool) -> m (Maybe PackageName, Bool)
Expand Down Expand Up @@ -1136,6 +1140,9 @@ configMonoidHideSourcePathsName = "hide-source-paths"
configMonoidRecommendUpgradeName :: Text
configMonoidRecommendUpgradeName = "recommend-stack-upgrade"

configMonoidCasaRepoPrefixName :: Text
configMonoidCasaRepoPrefixName = "casa-repo-prefix"

data ConfigException
= ParseConfigFileException (Path Abs File) ParseException
| ParseCustomSnapshotException Text ParseException
Expand Down

0 comments on commit 665a184

Please sign in to comment.