Ben Gamari pushed to branch wip/coverage at Glasgow Haskell Compiler / GHC Commits: ad06343d by Ben Gamari at 2025-06-08T10:07:40-04:00 hadrian: Add attoparsec and dependencies - - - - - c871cf34 by Ben Gamari at 2025-06-08T10:09:24-04:00 WIP submodule bumps - - - - - 5 changed files: - .gitmodules - hadrian/src/Packages.hs - hadrian/src/Settings/Default.hs - libraries/hpc - utils/hpc Changes: ===================================== .gitmodules ===================================== @@ -118,3 +118,12 @@ [submodule "libraries/file-io"] path = libraries/file-io url = https://gitlab.haskell.org/ghc/packages/file-io.git +[submodule "libraries/attoparsec"] + path = libraries/attoparsec + url = https://github.com/haskell/attoparsec +[submodule "libraries/scientific"] + path = libraries/scientific + url = https://github.com/basvandijk/scientific +[submodule "libraries/integer-logarithms"] + path = libraries/integer-logarithms + url = https://github.com/haskellari/integer-logarithms ===================================== hadrian/src/Packages.hs ===================================== @@ -1,15 +1,15 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} module Packages ( -- * GHC packages - array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, + attoparsec, array, base, binary, bytestring, cabal, cabalSyntax, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, fileio, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, - hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, + hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts, - runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, + runGhc, scientific, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, transformers, unlit, unix, win32, xhtml, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace, ghcPackages, isGhcPackage, @@ -33,13 +33,13 @@ import Oracles.Setting -- packages and modify build default build conditions in "UserSettings". ghcPackages :: [Package] ghcPackages = - [ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps + [ attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps , compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls , exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs - , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString - , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell + , hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, libffi, mtl, osString + , parsec, pretty, process, rts, runGhc, scientific, stm, semaphoreCompat, templateHaskell , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio , timeout , lintersCommon @@ -50,17 +50,18 @@ isGhcPackage :: Package -> Bool isGhcPackage = (`elem` ghcPackages) -- | Package definitions, see 'Package'. -array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, +attoparsec, array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, countDeps, compareSizes, compiler, containers, deepseq, deriveConstants, directory, dumpDecls, exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcBootThNext, ghcPlatform, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim, ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs, - hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl, + hp2ps, hpc, hpcBin, integerGmp, integerLogarithms, iserv, iservProxy, remoteIserv, libffi, mtl, osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, transformers, unlit, unix, win32, xhtml, timeout, lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace :: Package +attoparsec = lib "attoparsec" array = lib "array" base = lib "base" binary = lib "binary" @@ -109,6 +110,7 @@ hp2ps = util "hp2ps" hpc = lib "hpc" hpcBin = util "hpc-bin" `setPath` "utils/hpc" integerGmp = lib "integer-gmp" +integerLogarithms = lib "integer-logarithms" iserv = util "iserv" iservProxy = util "iserv-proxy" libffi = top "libffi" @@ -121,6 +123,7 @@ process = lib "process" remoteIserv = util "remote-iserv" rts = top "rts" runGhc = util "runghc" +scientific = lib "scientific" semaphoreCompat = lib "semaphore-compat" stm = lib "stm" templateHaskell = lib "template-haskell" ===================================== hadrian/src/Settings/Default.hs ===================================== @@ -80,7 +80,8 @@ stageBootPackages = return stage0Packages :: Action [Package] stage0Packages = do cross <- flag CrossCompiling - return $ [ cabalSyntax + return $ [ attoparsec + , cabalSyntax , cabal , compiler , directory -- depends on filepath, fileIo @@ -102,9 +103,11 @@ stage0Packages = do , hpc , hpcBin , hsc2hs + , integerLogarithms , osString -- new library not yet present for boot compilers , process -- depends on filepath , runGhc + , scientific , semaphoreCompat -- depends on , time -- depends on win32 , unlit ===================================== libraries/hpc ===================================== @@ -1 +1 @@ -Subproject commit 9e29abb785ab4f82c37c7a4e73ec999083955b09 +Subproject commit aa19d28b10bc35a675687d3f41e8924fe2c4cdf9 ===================================== utils/hpc ===================================== @@ -1 +1 @@ -Subproject commit d1780eb21c1e5a1227fff80c8d325d5142f04255 +Subproject commit 61ee79de0d50aef35a7fe8989d6fff5607774899 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e41547701472f8d1ca60e4234300cf3... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/e41547701472f8d1ca60e4234300cf3... You're receiving this email because of your account on gitlab.haskell.org.