[Git][ghc/ghc][wip/filepath-1.5] 5 commits: Bump hpc and hpc-bin submodule
Ben Gamari (@bgamari)
gitlab at gitlab.haskell.org
Wed Jan 24 13:58:01 UTC 2024
Ben Gamari pushed to branch wip/filepath-1.5 at Glasgow Haskell Compiler / GHC
Commits:
9d5a1772 by David Binder at 2024-01-23T11:52:22+01:00
Bump hpc and hpc-bin submodule
Bump hpc to 0.7.0.1
Bump hpc-bin to commit d1780eb2
- - - - -
f84d5557 by Ben Gamari at 2024-01-24T08:54:42-05:00
hsc2hs: Bump submodule
- - - - -
afed4032 by Ben Gamari at 2024-01-24T08:54:49-05:00
Bump containers submodule to 0.7
- - - - -
2779d575 by Ben Gamari at 2024-01-24T08:55:31-05:00
Add os-string as a boot package
This is necessary for `filepath-1.5`.
- - - - -
673d0968 by Ben Gamari at 2024-01-24T08:57:53-05:00
Bump filepath to 1.5.0.0
Required bumps of:
* `directory`
* `filepath`
* `haskeline`
* `process`
* `unix`
* `hsc2hs`
* `Win32`
* `semaphore-compat`
and the addition of `os-string` as a boot package.
- - - - -
24 changed files:
- .gitmodules
- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/src/Packages.hs
- hadrian/src/Settings/Default.hs
- hadrian/src/Settings/Packages.hs
- libraries/Cabal
- libraries/Win32
- libraries/containers
- libraries/directory
- libraries/filepath
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-heap/ghc-heap.cabal.in
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- libraries/hpc
- + libraries/os-string
- libraries/process
- libraries/semaphore-compat
- libraries/unix
- testsuite/tests/driver/T4437.hs
- utils/hpc
- utils/hsc2hs
- utils/iserv/iserv.cabal.in
Changes:
=====================================
.gitmodules
=====================================
@@ -117,3 +117,6 @@
[submodule "utils/hpc"]
path = utils/hpc
url = https://gitlab.haskell.org/hpc/hpc-bin.git
+[submodule "libraries/os-string"]
+ path = libraries/os-string
+ url = https://gitlab.haskell.org/ghc/packages/os-string
=====================================
compiler/ghc.cabal.in
=====================================
@@ -114,9 +114,9 @@ Library
bytestring >= 0.9 && < 0.13,
binary == 0.8.*,
time >= 1.4 && < 1.13,
- containers >= 0.6.2.1 && < 0.7,
+ containers >= 0.6.2.1 && < 0.8,
array >= 0.1 && < 0.6,
- filepath >= 1 && < 1.5,
+ filepath >= 1 && < 1.6,
template-haskell == 2.21.*,
hpc >= 0.6 && < 0.8,
transformers >= 0.5 && < 0.7,
=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -36,8 +36,8 @@ Executable ghc
bytestring >= 0.9 && < 0.13,
directory >= 1 && < 1.4,
process >= 1 && < 1.7,
- filepath >= 1 && < 1.5,
- containers >= 0.5 && < 0.7,
+ filepath >= 1 && < 1.6,
+ containers >= 0.5 && < 0.8,
transformers >= 0.5 && < 0.7,
ghc-boot == @ProjectVersionMunged@,
ghc == @ProjectVersionMunged@
=====================================
hadrian/src/Packages.hs
=====================================
@@ -8,7 +8,7 @@ module Packages (
ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim,
ghcToolchain, ghcToolchainBin, haddock, haskeline,
hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, iservProxy,
- libffi, mtl, parsec, pretty, primitive, process, remoteIserv, rts,
+ libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts,
runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout, touchy,
transformers, unlit, unix, win32, xhtml,
lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace,
@@ -40,7 +40,7 @@ ghcPackages =
, exceptions, filepath, genapply, genprimopcode, ghc, ghcBignum, ghcBoot, ghcBootTh, ghcPlatform
, ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim
, ghcToolchain, ghcToolchainBin, haddock, haskeline, hsc2hs
- , hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, mtl
+ , hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, mtl, osString
, parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell
, terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml
, timeout
@@ -58,7 +58,7 @@ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, count
ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim,
ghcToolchain, ghcToolchainBin, haddock, haskeline, hsc2hs,
hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, iservProxy, remoteIserv, libffi, mtl,
- parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell,
+ osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell,
terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml,
timeout,
lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace
@@ -112,6 +112,7 @@ iserv = util "iserv"
iservProxy = util "iserv-proxy"
libffi = top "libffi"
mtl = lib "mtl"
+osString = lib "os-string"
parsec = lib "parsec"
pretty = lib "pretty"
primitive = lib "primitive"
=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -103,6 +103,7 @@ stage0Packages = do
, hpc
, hpcBin
, mtl
+ , osString
, parsec
, semaphoreCompat
, time
=====================================
hadrian/src/Settings/Packages.hs
=====================================
@@ -157,6 +157,10 @@ packageArgs = do
]
+ , package unix ? builder (Cabal Flags) ? arg "+os-string"
+ , package directory ? builder (Cabal Flags) ? arg "+os-string"
+ , package win32 ? builder (Cabal Flags) ? arg "+os-string"
+
--------------------------------- iserv --------------------------------
-- Add -Wl,--export-dynamic enables GHCi to load dynamic objects that
-- refer to the RTS. This is harmless if you don't use it (adds a bit
=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit a0d815c4773a9d7aa0f48cc5bd08947d282dc917
+Subproject commit ae3c40a20bf98870488e3b40fc4495009b026e33
=====================================
libraries/Win32
=====================================
@@ -1 +1 @@
-Subproject commit efab7f1146da9741dc54fb35476d4aaabeff8d6d
+Subproject commit 350ebd43f9a8d9e1ca767b0000f95bdfb42a5471
=====================================
libraries/containers
=====================================
@@ -1 +1 @@
-Subproject commit f61b0c9104a3c436361f56a0974c5eeef40c1b89
+Subproject commit 4fda06c43ea14f808748aa8988158946c3ce0caf
=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit a0c9361817db13917df7777f669a97c4d787f44e
+Subproject commit fc38cbfc5c7c4b631ed89d6b41bbe00ee96c8b21
=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit cdb5171f7774569b1a8028a78392cfa79f732b5c
+Subproject commit b55465e3d174ccd63914e7146079435503204187
=====================================
libraries/ghc-boot/ghc-boot.cabal.in
=====================================
@@ -76,9 +76,9 @@ Library
build-depends: base >= 4.7 && < 4.20,
binary == 0.8.*,
bytestring >= 0.10 && < 0.13,
- containers >= 0.5 && < 0.7,
+ containers >= 0.5 && < 0.8,
directory >= 1.2 && < 1.4,
- filepath >= 1.3 && < 1.5,
+ filepath >= 1.3 && < 1.6,
deepseq >= 1.4 && < 1.6,
ghc-platform >= 0.1,
ghc-boot-th == @ProjectVersionMunged@
=====================================
libraries/ghc-heap/ghc-heap.cabal.in
=====================================
@@ -25,7 +25,7 @@ library
build-depends: base >= 4.9.0 && < 5.0
, ghc-prim > 0.2 && < 0.12
, rts == 1.0.*
- , containers >= 0.6.2.1 && < 0.7
+ , containers >= 0.6.2.1 && < 0.8
ghc-options: -Wall
if !os(ghcjs)
=====================================
libraries/ghci/ghci.cabal.in
=====================================
@@ -79,9 +79,9 @@ library
ghc-prim >= 0.5.0 && < 0.12,
binary == 0.8.*,
bytestring >= 0.10 && < 0.13,
- containers >= 0.5 && < 0.7,
+ containers >= 0.5 && < 0.8,
deepseq >= 1.4 && < 1.6,
- filepath == 1.4.*,
+ filepath >= 1.4 && < 1.6,
ghc-boot == @ProjectVersionMunged@,
ghc-heap == @ProjectVersionMunged@,
template-haskell == 2.21.*,
=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit 16ee820fc86f43045365f2c3536ad18147eb0b79
+Subproject commit ab2272336641195d0d087a6ccfd9bf511d208860
=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 60424b55b6c44254eab3887bb76bf7997aefa8ba
+Subproject commit 496ff3b1a2d14a57ea9065099a4bb78ab8919170
=====================================
libraries/os-string
=====================================
@@ -0,0 +1 @@
+Subproject commit fb2711ba1f43fd609de0e231e161025ee8ed3216
=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 5ba847afd894b560b7a7c2569c99bb9f4c8cb282
+Subproject commit 2140736ee0c73c89e75ac208589af98c2919fbbe
=====================================
libraries/semaphore-compat
=====================================
@@ -1 +1 @@
-Subproject commit c8fc7b1757b4eecbd10239038fbc6602340105b1
+Subproject commit 8cd32a85388c7b51786a7aedd15404e2e4896f1b
=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit 0b3dbc9901fdf2d752c4ee7a7cee7b1ed20e76bd
+Subproject commit 7db23ecad7593210ce38c48a462be6c50d080e00
=====================================
testsuite/tests/driver/T4437.hs
=====================================
@@ -37,7 +37,7 @@ check title expected got
-- See Note [Adding a language extension] in compiler/GHC/Driver/Session.hs.
expectedGhcOnlyExtensions :: [String]
expectedGhcOnlyExtensions =
- [ "TypeAbstractions"
+ [
]
expectedCabalOnlyExtensions :: [String]
=====================================
utils/hpc
=====================================
@@ -1 +1 @@
-Subproject commit 4b46380a06c16e38a5b9d623ab85538ee4b2319d
+Subproject commit d1780eb21c1e5a1227fff80c8d325d5142f04255
=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit 5bf5c61e7c6e813d03bc069e17289c574185d41c
+Subproject commit a6d9f73689ac51100ed7f6af0ea8cecd34422a91
=====================================
utils/iserv/iserv.cabal.in
=====================================
@@ -34,7 +34,7 @@ Executable iserv
base >= 4 && < 5,
binary >= 0.7 && < 0.11,
bytestring >= 0.10 && < 0.13,
- containers >= 0.5 && < 0.7,
+ containers >= 0.5 && < 0.8,
deepseq >= 1.4 && < 1.6,
ghci == @ProjectVersionMunged@
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ac9d9420c2558a421ff573deae81c45915e68593...673d09682bae25a00448d33c24e04b61c5f39188
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ac9d9420c2558a421ff573deae81c45915e68593...673d09682bae25a00448d33c24e04b61c5f39188
You're receiving this email because of your account on gitlab.haskell.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240124/322a7965/attachment-0001.html>
More information about the ghc-commits
mailing list