Skip to content

Commit

Permalink
[NO-ISSUE] Use fourmolu-0.16.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tchoutri committed Aug 6, 2024
1 parent 6b9c792 commit e6c48ef
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The compiler version used is described in the `cabal.project` file.
The following Haskell command-line tools will have to be installed:

* `postgresql-migration`: To perform schema migrations
* `fourmolu`: To style the code base. Version is 0.14.1.0
* `fourmolu`: To style the code base. Version is 0.16.2.0
* `hlint` & `apply-refact`: To enforce certain patterns in the code base ("lint")
* `cabal-fmt` and `nixfmt`: To style the cabal and nix files
* `ghcid`: To automatically reload the Haskell code base upon source changes
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG UID=1000

ARG GHC_VERSION=9.6.5
ARG CABAL_VERSION=3.10.3.0
ARG FOURMOLU_VERSION=0.14.1.0
ARG FOURMOLU_VERSION=0.16.2.0
ARG HLINT_VERSION=3.8
ARG APPLY_REFACT_VERSION=0.14.0.0
ARG CABAL_FMT_VERSION=0.1.12
Expand Down
12 changes: 4 additions & 8 deletions src/web/FloraWeb/Pages/Server/Admin.hs
Original file line number Diff line number Diff line change
Expand Up @@ -57,26 +57,23 @@ fetchMetadataHandler (Headers session _) = do
forkIO $
Async.forConcurrently_
releasesWithoutReadme
( \(releaseId, version, packagename) -> scheduleReadmeJob jobsPool releaseId packagename version
)
(\(releaseId, version, packagename) -> scheduleReadmeJob jobsPool releaseId packagename version)

releasesWithoutUploadTime <- Query.getHackagePackageReleasesWithoutUploadTimestamp
liftIO $
void $
forkIO $
Async.forConcurrently_
releasesWithoutUploadTime
( \(releaseId, version, packagename) -> scheduleUploadTimeJob jobsPool releaseId packagename version
)
(\(releaseId, version, packagename) -> scheduleUploadTimeJob jobsPool releaseId packagename version)

releasesWithoutChangelog <- Query.getHackagePackageReleasesWithoutChangelog
liftIO $
void $
forkIO $
Async.forConcurrently_
releasesWithoutChangelog
( \(releaseId, version, packagename) -> scheduleChangelogJob jobsPool releaseId packagename version
)
(\(releaseId, version, packagename) -> scheduleChangelogJob jobsPool releaseId packagename version)

features <- ask @FeatureEnv
Log.logAttention "features" features
Expand All @@ -97,8 +94,7 @@ fetchMetadataHandler (Headers session _) = do
forkIO $ do
Async.forConcurrently_
packagesWithoutDeprecationInformation
( \a -> scheduleReleaseDeprecationListJob jobsPool a
)
(\a -> scheduleReleaseDeprecationListJob jobsPool a)
void $ scheduleRefreshLatestVersions jobsPool

pure $ redirect "/admin"
9 changes: 3 additions & 6 deletions src/web/FloraWeb/Pages/Templates/Packages.hs
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ listVersions namespace packageName releases =
ul_ [class_ "package-list"] $
Vector.forM_
releases
( versionListItem namespace packageName
)
(versionListItem namespace packageName)

versionListItem :: Namespace -> PackageName -> Release -> FloraHTML
versionListItem namespace packageName release = do
Expand Down Expand Up @@ -212,8 +211,7 @@ packageListing mExactMatchItems packages =
packageListItem (em.namespace, em.name, em.synopsis, em.version, em.license)
Vector.forM_
packages
( \PackageInfo{..} -> packageListItem (namespace, name, synopsis, version, license)
)
(\PackageInfo{..} -> packageListItem (namespace, name, synopsis, version, license))

packageWithExecutableListing
:: Vector PackageInfoWithExecutables
Expand Down Expand Up @@ -430,8 +428,7 @@ displayTestedWith compilersVersions'
ul_ [class_ "compiler-badges"] $
Vector.forM_
compilersVersions
( li_ [] . a_ [class_ "compiler-badge"] . toHtml @Text . display
)
(li_ [] . a_ [class_ "compiler-badge"] . toHtml @Text . display)

displayMaintainer :: Text -> FloraHTML
displayMaintainer maintainerInfo =
Expand Down

0 comments on commit e6c48ef

Please sign in to comment.