Ghc 9.4.8 (#1357)

* Haskell 9.4.8

* Try split-sections on windows.

* Experimental stan config to ask it to not report StrictData.

* Use 9.4.8 in lint and benchmarks.

* Fix lint.

* Update cabal version.

* Satisfy hlint/fourmolu.

* Clean up split-sections message.

Author: csasarak

.github/workflows/bench.yml

@@ -5,7 +5,7 @@ jobs:
   benchmarks:
     name: benchmarks
     runs-on: ubuntu-latest
-    container: fossa/haskell-static-alpine:ghc-9.4.7
+    container: fossa/haskell-static-alpine:ghc-9.4.8
 
     steps:
     - uses: dtolnay/rust-toolchain@stable

.github/workflows/build-all.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container }}
     env:
-      GHC_VERSION: '9.4.7'
+      GHC_VERSION: '9.4.8'
 
 
     defaults:
@@ -23,19 +23,19 @@ jobs:
         include:
         - os: ubuntu-latest
           os-name: Linux
-          container: fossa/haskell-static-alpine:ghc-9.4.7
+          container: fossa/haskell-static-alpine:ghc-9.4.8
           project-file: cabal.project.ci.linux
-          ghc: '9.4.7'
+          ghc: '9.4.8'
 
         - os: macos-latest
           os-name: macOS
           project-file: cabal.project.ci.macos
-          ghc: '9.4.7'
+          ghc: '9.4.8'
 
         - os: windows-latest
           os-name: Windows
           project-file: cabal.project.ci.windows
-          ghc: '9.4.7'
+          ghc: '9.4.8'
 
     steps:
 
@@ -56,7 +56,7 @@ jobs:
       if: ${{ !contains(matrix.os, 'ubuntu') }}
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.8.1.0'
+        cabal-version: '3.10.2.1'
 
     # Set up Rust.
     # This action installs the 'minimal' profile.

.github/workflows/integrations-test.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on:
       group: "FOSSA CLI Runner"
     # Be sure to update the env below too
-    container: fossa/haskell-static-alpine:ghc-9.4.7
+    container: fossa/haskell-static-alpine:ghc-9.4.8
 
     env:
-      GHC_VERSION: '9.4.7'
+      GHC_VERSION: '9.4.8'
 
     steps:
     - uses: dtolnay/rust-toolchain@stable

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ jobs:
   linter-check:
     name: linter-check
     runs-on: ubuntu-latest
-    container: ghcr.io/fossas/haskell-dev-tools:9.4.7
+    container: ghcr.io/fossas/haskell-dev-tools:9.4.8
 
     steps:
       - uses: dtolnay/rust-toolchain@stable
@@ -39,7 +39,7 @@ jobs:
   format-check:
     name: formatter-check
     runs-on: ubuntu-latest
-    container: ghcr.io/fossas/haskell-dev-tools:9.4.7
+    container: ghcr.io/fossas/haskell-dev-tools:9.4.8
 
     steps:
       - uses: dtolnay/rust-toolchain@stable
@@ -56,7 +56,7 @@ jobs:
   cabal-format-check:
     name: cabal-format-check
     runs-on: ubuntu-latest
-    container: ghcr.io/fossas/haskell-dev-tools:9.4.7
+    container: ghcr.io/fossas/haskell-dev-tools:9.4.8
 
     steps:
       - uses: actions/checkout@v4

.stan.toml

@@ -0,0 +1 @@
+ignore = [{ id = "STAN-0206" }]

Makefile

@@ -3,7 +3,7 @@ current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 FMT_OPTS := -co -XTypeApplications -o -XImportQualifiedPost
 FIND_OPTS := src test integration-test -type f -name '*.hs'
-GHC_VERSION := 9.4.7
+GHC_VERSION := 9.4.8
 DEV_TOOLS := ghcr.io/fossas/haskell-dev-tools:${GHC_VERSION}
 MOUNTED_DEV_TOOLS_OPTS := --rm
 MOUNTED_DEV_TOOLS_OPTS += --mount "type=bind,source=${current_dir},target=/fossa-cli"

cabal.project.ci.windows

@@ -1,11 +1,5 @@
 executable-static: True
--- -split-sections causes errors on Windows with GHC 9.4 and is off by default.
--- I filed a bug about it here: https://gitlab.haskell.org/ghc/ghc/-/issues/23961
--- -split-sections are meant to reduce executable size: https://downloads.haskell.org/ghc/9.4.7/docs/users_guide/phases.html?highlight=split%20sections#ghc-flag--split-sections
--- The binaries made in CI without this were ~122 MB to ~116 MB with this option.
--- Compressed, the differences is < 1 MB so I don't think holding off the upgrade for this is worthwhile.
--- It may be worth looking into in the future to see if this can be turned back on though.
-split-sections: False
+split-sections: True
 tests: True
 optimization: 2
 jobs: $ncpus

src/App/Fossa/Analyze/Filter.hs

@@ -32,9 +32,9 @@ checkForEmptyUpload includeAll discovered filtered additionalUnits firstPartySca
       (_, _, Just licenseSourceUnit) -> CountedScanUnits $ SourceAndLicenseUnits discoveredUnits licenseSourceUnit
       (_, _, Nothing) -> CountedScanUnits . SourceUnitOnly $ discoveredUnits
     else -- If we have a additional source units, then there's always something to upload.
-    case licensesMaybeFound of
-      Nothing -> CountedScanUnits . SourceUnitOnly $ additionalUnits ++ discoveredUnits
-      Just licenseSourceUnit -> CountedScanUnits $ SourceAndLicenseUnits (additionalUnits ++ discoveredUnits) licenseSourceUnit
+      case licensesMaybeFound of
+        Nothing -> CountedScanUnits . SourceUnitOnly $ additionalUnits ++ discoveredUnits
+        Just licenseSourceUnit -> CountedScanUnits $ SourceAndLicenseUnits (additionalUnits ++ discoveredUnits) licenseSourceUnit
   where
     discoveredLen = length discovered
     filteredLen = length filtered

src/App/Fossa/Config/ConfigFile.hs

@@ -359,9 +359,8 @@ instance FromJSON ExperimentalGradleConfigs where
 
 instance FromJSON MavenScopeConfig where
   parseJSON = withObject "MavenScopeConfig" $ \obj ->
-    MavenScopeOnlyConfig
-      <$> (Set.fromList <$> obj .: "scope-only" .!= [])
-      <|> MavenScopeExcludeConfig <$> (Set.fromList <$> obj .:? "scope-exclude" .!= [])
+    MavenScopeOnlyConfig . Set.fromList <$> (obj .: "scope-only" .!= [])
+      <|> MavenScopeExcludeConfig . Set.fromList <$> (obj .:? "scope-exclude" .!= [])
 
 instance FromJSON ConfigTelemetry where
   parseJSON = withObject "ConfigTelemetry" $ \obj ->

src/Container/Docker/OciManifest.hs

@@ -72,8 +72,8 @@ data OciManifestLayer = OciManifestLayer
 
 instance FromJSON OciManifestLayer where
   parseJSON = withObject "LayerEntry" $ \o ->
-    OciManifestLayer
-      <$> (RepoDigest <$> o .: "digest")
+    OciManifestLayer . RepoDigest
+      <$> (o .: "digest")
       <*> o .: "mediaType"
 
 data LayerKind

src/Data/Rpm/DbHeaderBlob/Internal.hs

@@ -305,10 +305,10 @@ readHeaderBlobTagData :: BLS.ByteString -> HeaderBlob -> Either String [TagValue
 readHeaderBlobTagData bs HeaderBlob{..} = do
   let firstEntry = NonEmpty.head entryMetadatas
   if tag firstEntry >= TagHeaderI18nTable
-    then -- v3 entries, these seem to be uncommon. They are distinct from > v4
-    -- entries in that they don't have a specialized region for v3 data, which
-    -- is why the function doesn't skip the first element of entryMetadatas
-
+    then
+      -- v3 entries, these seem to be uncommon. They are distinct from > v4
+      -- entries in that they don't have a specialized region for v3 data, which
+      -- is why the function doesn't skip the first element of entryMetadatas
       bimap
         ("Failed to parse legacy index entries: " <>)
         fst

src/Fossa/API/Types.hs

@@ -674,8 +674,8 @@ data UploadResponse = UploadResponse
 
 instance FromJSON UploadResponse where
   parseJSON = withObject "UploadResponse" $ \obj ->
-    UploadResponse
-      <$> (parseLocator <$> obj .: "locator")
+    UploadResponse . parseLocator
+      <$> (obj .: "locator")
       <*> obj .:? "error"
       <*> obj .:? "warnings"
 

src/Strategy/Maven/PluginTree.hs

@@ -68,7 +68,6 @@ parseArtifactChild prefixCount =
     pos <- currentColumn
     if pos == prefixCount
       then -- The parser is where we expect a child of its parent to be positioned
-
         lexeme (string "+-" <|> string "\\-")
           *> parseTextArtifactAndChildren False
       else fail "can't parse child"

src/Strategy/Python/Pip.hs

@@ -90,7 +90,7 @@ pipShowParser = many (try parseMetadata <|> try parseSection)
     parseMetadata = do
       name <- parseField "Name"
       version <- parseField "Version"
-      requires <- filter (/= "") <$> (Text.splitOn ", " <$> parseField "Requires")
+      requires <- filter (/= "") . Text.splitOn ", " <$> (parseField "Requires")
       pure $ PackageMetadata name version requires
 
     parseField :: Text -> Parser Text

src/Strategy/R/Renv.hs

@@ -166,27 +166,27 @@ buildGraph description renvLock = run . evalGrapher $ do
   let allDirectPkgs = allPkgNames description
 
   if null $ Map.toList allLockPackages
-    then -- We have empty lock file, and only description manifest
-    -- create direct dependencies
+    then
+      -- We have empty lock file, and only description manifest
+      -- create direct dependencies
+      for_ (toList allDirectPkgs) $ \pkgReq -> do
+        direct $ toCranDependency pkgReq
+    else
+      -- We have non-empty lock file, and description manifest
+      -- create complete dependency graph. Any dependency that
+      -- is mentioned in description is considered to be direct
+      for_ (Map.toList allLockPackages) $ \(_, pkgMetadata) -> do
+        let currentDep = toDependency allRepositories pkgMetadata
+        let childDeps =
+              map (toDependency allRepositories) $
+                mapMaybe (`Map.lookup` allLockPackages) (pkgRequirements pkgMetadata)
 
-    for_ (toList allDirectPkgs) $ \pkgReq -> do
-      direct $ toCranDependency pkgReq
-    else -- We have non-empty lock file, and description manifest
-    -- create complete dependency graph. Any dependency that
-    -- is mentioned in description is considered to be direct
+        if Set.member (pkgName pkgMetadata) allDirectPkgs
+          then direct currentDep
+          else deep currentDep
 
-    for_ (Map.toList allLockPackages) $ \(_, pkgMetadata) -> do
-      let currentDep = toDependency allRepositories pkgMetadata
-      let childDeps =
-            map (toDependency allRepositories) $
-              mapMaybe (`Map.lookup` allLockPackages) (pkgRequirements pkgMetadata)
-
-      if Set.member (pkgName pkgMetadata) allDirectPkgs
-        then direct currentDep
-        else deep currentDep
-
-      for_ childDeps $
-        edge currentDep
+        for_ childDeps $
+          edge currentDep
 
 toCranDependency :: Text -> Dependency
 toCranDependency pkg = Dependency CranType pkg Nothing mempty mempty mempty

src/Strategy/Swift/Xcode/PbxprojParser.hs

@@ -118,7 +118,7 @@ parseAsciiValue :: Parser AsciiValue
 parseAsciiValue = try parseAsciiDict <|> try parseAsciiList <|> parseAsciiText
 
 parseAsciiDict :: Parser AsciiValue
-parseAsciiDict = ADict <$> (Map.fromList <$> lexeme (betweenCurlyBrackets $ sepEndBy (try parseAsciiKeyValue) (symbol ";")))
+parseAsciiDict = ADict . Map.fromList <$> (lexeme (betweenCurlyBrackets $ sepEndBy (try parseAsciiKeyValue) (symbol ";")))
 
 parseAsciiKeyValue :: Parser (Text, AsciiValue)
 parseAsciiKeyValue = do

test/App/Fossa/Report/AttributionSpec.hs

@@ -17,8 +17,8 @@ defaultRange = Range.linear 0 50
 
 genLicense :: Gen License
 genLicense =
-  License
-    <$> (LicenseName <$> arbitraryText)
+  License . LicenseName
+    <$> arbitraryText
     <*> Gen.maybe (LicenseContents <$> arbitraryText)
 
 genProject :: Gen Project