haskell/stackage-server
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage-server.git synced 2026-01-22 00:41:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #313 from andreabedini/with-compiler

Browse Source 
Add with-compiler to snapshot's cabal.config file
This commit is contained in:
Michael Snoyman 2022-06-09 06:57:20 +03:00 committed by GitHub
commit e37596e30a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Handler/StackageHome.hs
View File

@ -13,6 +13,7 @@ module Handler.StackageHome
) where ) where
import Data.These import Data.These
import RIO (textDisplay)
import RIO.Time (FormatTime) import RIO.Time (FormatTime)
import Import import Import
import Stackage.Database import Stackage.Database
@ -65,7 +66,7 @@ getStackageDiffR name1 name2 = track "Handler.StackageHome.getStackageDiffR" $ d
getStackageCabalConfigR :: SnapName -> Handler TypedContent getStackageCabalConfigR :: SnapName -> Handler TypedContent
getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfigR" $ do getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfigR" $ do
cacheSeconds $ 60 * 60 * 48 cacheSeconds $ 60 * 60 * 48
Entity sid _ <- lookupSnapshot name >>= maybe notFound return Entity sid snapshot <- lookupSnapshot name >>= maybe notFound return
render <- getUrlRender render <- getUrlRender
mdownload <- lookupGetParam "download" mdownload <- lookupGetParam "download"
@ -79,16 +80,18 @@ getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfi
respondSource typePlain $ yieldMany plis .| respondSource typePlain $ yieldMany plis .|
if isGlobal if isGlobal
then conduitGlobal render then conduitGlobal (snapshotCompiler snapshot) render
else conduitLocal render else conduitLocal (snapshotCompiler snapshot) render
where where
-- FIXME move this stuff into stackage-common -- FIXME move this stuff into stackage-common
conduitGlobal render = do conduitGlobal compiler render = do
headerGlobal render headerGlobal render
compilerVersion compiler
mapC (Chunk . showPackageGlobal) mapC (Chunk . showPackageGlobal)
conduitLocal render = do conduitLocal compiler render = do
headerLocal render headerLocal render
compilerVersion compiler
goFirst goFirst
mapC (Chunk . showPackageLocal) mapC (Chunk . showPackageLocal)
yield $ Chunk $ toBuilder '\n' yield $ Chunk $ toBuilder '\n'
@ -116,6 +119,11 @@ getStackageCabalConfigR name = track "Handler.StackageHome.getStackageCabalConfi
toBuilder (snapshotUrl render) ++ toBuilder (snapshotUrl render) ++
toBuilder '\n' toBuilder '\n'
compilerVersion compiler = yield $ Chunk $
toBuilder (asText "with-compiler: ") ++
toBuilder (textDisplay compiler) ++
toBuilder '\n'
oldSnapshotUrl render = asHttp $ render $ OldSnapshotR (toPathPiece name) [] oldSnapshotUrl render = asHttp $ render $ OldSnapshotR (toPathPiece name) []
snapshotUrl render = asHttp $ render $ SnapshotR name StackageHomeR snapshotUrl render = asHttp $ render $ SnapshotR name StackageHomeR