Teo Camarasu pushed to branch wip/T25262 at Glasgow Haskell Compiler / GHC

Commits:

5 changed files:

Changes:

  • .gitmodules
    ... ... @@ -118,3 +118,9 @@
    118 118 
     [submodule "libraries/file-io"]
    119 119 
     	path = libraries/file-io
    120 120 
     	url = https://gitlab.haskell.org/ghc/packages/file-io.git
    121 
    +[submodule "libraries/template-haskell-lift"]
    122 
    +	path = libraries/template-haskell-lift
    123 
    +	url = https://gitlab.haskell.org/ghc/template-haskell-lift.git
    124 
    +[submodule "libraries/template-haskell-quasiquoter"]
    125 
    +	path = libraries/template-haskell-quasiquoter
    126 
    +	url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git

  • hadrian/src/Packages.hs
    ... ... @@ -9,7 +9,7 @@ module Packages (
    9 9 
         ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline,
    10 10 
         hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy,
    11 11 
         libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts,
    12 
    -    runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout,
    12 
    +    runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, timeout,
    13 13 
         transformers, unlit, unix, win32, xhtml,
    14 14 
         lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace,
    15 15 
         ghcPackages, isGhcPackage,
    ... ... @@ -39,7 +39,7 @@ ghcPackages =
    39 39 
         , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim
    40 40 
         , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs
    41 41 
         , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString
    42 
    -    , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell
    42 
    +    , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell, thLift, thQuasiquoter
    43 43 
         , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio
    44 44 
         , timeout
    45 45 
         , lintersCommon
    ... ... @@ -56,7 +56,7 @@ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, count
    56 56 
       ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim,
    57 57 
       ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs,
    58 58 
       hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl,
    59 
    -  osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell,
    59 
    +  osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter,
    60 60 
       terminfo, text, time, transformers, unlit, unix, win32, xhtml,
    61 61 
       timeout,
    62 62 
       lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace
    ... ... @@ -124,6 +124,8 @@ runGhc = util "runghc"
    124 124 
     semaphoreCompat     = lib  "semaphore-compat"
    125 125 
     stm                 = lib  "stm"
    126 126 
     templateHaskell     = lib  "template-haskell"
    127 
    +thLift              = lib  "template-haskell-lift"
    128 
    +thQuasiquoter       = lib  "template-haskell-quasiquoter"
    127 129 
     terminfo            = lib  "terminfo"
    128 130 
     text                = lib  "text"
    129 131 
     time                = lib  "time"

  • hadrian/src/Settings/Default.hs
    ... ... @@ -107,6 +107,7 @@ stage0Packages = do
    107 107 
                  , runGhc
    108 108 
                  , semaphoreCompat -- depends on
    109 109 
                  , time -- depends on win32
    110 
    +             , thLift -- new library not yet present for boot compilers
    110 111 
                  , unlit
    111 112 
                  , if windowsHost then win32 else unix
    112 113 
                  -- We must use the in-tree `Win32` as the version
    ... ... @@ -169,6 +170,7 @@ stage1Packages = do
    169 170 
             , semaphoreCompat
    170 171 
             , stm
    171 172 
             , templateHaskell
    173 
    +        , thQuasiquoter
    172 174 
             , text
    173 175 
             , transformers
    174 176 
             , unlit

  • libraries/template-haskell-lift
    1 
    +Subproject commit f7e5e9255ee1a0845050302ed46d2a7bb56ebade

  • libraries/template-haskell-quasiquoter
    1 
    +Subproject commit c242b581ffa407b76495209d455c28a499ff3883

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help