Skip to content

Upgrade ghc and dependencies #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neilmayhew wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Upgrade ghc and dependencies #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab74cee
flake.lock: Update
github-actions[bot] Jan 4, 2026
f98bbb7
Update to ghc 9.6.7
neilmayhew Dec 25, 2025
30ed12a
Fix incomplete pattern warnings
neilmayhew Dec 29, 2025
53d047a
Upgrade to ghc 9.8.4 and fourmolu 0.19.0.1
neilmayhew Dec 25, 2025
1d2f262
Reformat with fourmolu
neilmayhew Dec 29, 2025
b59d785
Bump package version
neilmayhew Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/Foliage/CmdImportIndex.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ isCabalFile
, Tar.entryContent = Tar.NormalFile contents _
, Tar.entryTime = posixSecondsToUTCTime . fromIntegral -> time
}
| ".cabal" `isSuffixOf` path =
let [pkgName, pkgVersion, _] = splitDirectories path
Just name = simpleParsec pkgName
Just version = simpleParsec pkgVersion
packageId = PackageIdentifier name version
in Just (packageId, contents, time)
| ".cabal" `isSuffixOf` path
, [pkgName, pkgVersion, _] <- splitDirectories path
, Just name <- simpleParsec pkgName
, Just version <- simpleParsec pkgVersion
, packageId <- PackageIdentifier name version =
Just (packageId, contents, time)
isCabalFile _ = Nothing
7 changes: 4 additions & 3 deletions app/Foliage/Meta.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,10 @@ revisionMetaCodec =
data DeprecationSpec = DeprecationSpec
{ deprecationTimestamp :: UTCTime
, deprecationIsDeprecated :: Bool
-- ^ 'True' means the package version has been deprecated
-- 'False' means the package version has been undeprecated
-- FIXME: we should consider something better than 'Bool'
{- ^ 'True' means the package version has been deprecated
'False' means the package version has been undeprecated
FIXME: we should consider something better than 'Bool'
-}
}
deriving (Show, Eq, Generic, Ord)
deriving anyclass (Binary, Hashable, NFData)
Expand Down
10 changes: 5 additions & 5 deletions app/Foliage/Pages.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,11 @@ makeAllPackageVersionsPage currentTime outputDir packageVersions =
}
-- list of revisions
: [ AllPackageVersionsPageEntryRevision
{ allPackageVersionsPageEntryPkgId = pkgId
, allPackageVersionsPageEntryTimestamp = revisionTimestamp
, allPackageVersionsPageEntryTimestampPosix = utcTimeToPOSIXSeconds revisionTimestamp
, allPackageVersionsPageEntryDeprecated = pkgVersionIsDeprecated
}
{ allPackageVersionsPageEntryPkgId = pkgId
, allPackageVersionsPageEntryTimestamp = revisionTimestamp
, allPackageVersionsPageEntryTimestampPosix = utcTimeToPOSIXSeconds revisionTimestamp
, allPackageVersionsPageEntryDeprecated = pkgVersionIsDeprecated
}
| (revisionTimestamp, _) <- cabalFileRevisions
]
)
Expand Down
4 changes: 2 additions & 2 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
packages: .
index-state: 2023-09-10T21:31:08Z
with-compiler: ghc-9.4.8
index-state: 2025-12-23T23:59:20Z
with-compiler: ghc-9.8.4

tests: True
test-show-details: direct
Loading
Loading