[Git][ghc/ghc][wip/backports] 2 commits: Bump Cabal, haskeline, directory, process submodules

[Ben Gamari]

Ben Gamari pushed to branch wip/backports at Glasgow Haskell Compiler / GHC


Commits:
4c37274a by Ben Gamari at 2020-09-25T17:39:53-04:00
Bump Cabal, haskeline, directory, process submodules

To accomodate Win32 2.10.0.0.

- - - - -
12957a0b by Ben Gamari at 2020-09-25T17:39:53-04:00
Disable -Wdeprecations for deepseq

Use to use of Data.Semigroup.Option for NFData instance.

- - - - -


8 changed files:

- compiler/ghc.cabal.in
- ghc/ghc-bin.cabal.in
- hadrian/src/Settings/Warnings.hs
- libraries/Cabal
- libraries/directory
- libraries/haskeline
- libraries/process
- mk/warnings.mk


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -77,7 +77,7 @@ Library
                    ghci == @ProjectVersionMunged@
 
     if os(windows)
-        Build-Depends: Win32  >= 2.3 && < 2.10
+        Build-Depends: Win32  >= 2.3 && < 2.11
     else
         if flag(terminfo)
             Build-Depends: terminfo == 0.4.*


=====================================
ghc/ghc-bin.cabal.in
=====================================
@@ -45,7 +45,7 @@ Executable ghc
                    ghc        == @ProjectVersionMunged@
 
     if os(windows)
-        Build-Depends: Win32  >= 2.3 && < 2.10
+        Build-Depends: Win32  >= 2.3 && < 2.11
     else
         Build-Depends: unix   >= 2.7 && < 2.9
 


=====================================
hadrian/src/Settings/Warnings.hs
=====================================
@@ -31,6 +31,7 @@ ghcWarningsArgs = do
         , package bytestring   ? pure [ "-Wno-inline-rule-shadowing" ]
         , package compiler     ? pure [ "-Wcpp-undef" ]
         , package directory    ? pure [ "-Wno-unused-imports" ]
+        , package deepseq      ? pure [ "-Wno-deprecations" ]
         , package ghc          ? pure [ "-Wcpp-undef"
                                       , "-Wincomplete-uni-patterns"
                                       , "-Wincomplete-record-updates"


=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 5139d6e72d391bffa3cf06f08884277799eb0b45
+Subproject commit 5aea8a4b8463e1ae95272e190a1022764164294f


=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit c16afcda5708ee9944afa7ea6858e5be894fe67e
+Subproject commit b697b3ea77dd4803f2f8f676dd64c8ea5277fcf0


=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit 5f16b76168f13c6413413386efc44fb1152048d5
+Subproject commit 2790f1c6ed94990ed51466079e8fb1097129c9b8


=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit cb1d1a6ead68f0e1b209277e79ec608980e9ac84
+Subproject commit 72c6be917064c923e365622032d1f2fa07acb5eb


=====================================
mk/warnings.mk
=====================================
@@ -80,6 +80,8 @@ libraries/haskeline_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 libraries/haskeline_dist-install_EXTRA_HC_OPTS += -Wno-redundant-constraints
 libraries/haskeline_dist-install_EXTRA_HC_OPTS += -Wno-simplifiable-class-constraints
 
+# temporarily turn off deprecations in deepseq due to NFData Option instance.
+libraries/deepseq_dist-install_EXTRA_HC_OPTS += -Wno-deprecations
 
 # temporarily turn off unused-imports warnings for pretty
 libraries/pretty_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4d71fb5b1c5a6ff13d5d23b8c10830313a6e21f7...12957a0b1c74e35f1584b09ba90caa52752be575

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/4d71fb5b1c5a6ff13d5d23b8c10830313a6e21f7...12957a0b1c74e35f1584b09ba90caa52752be575
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/20200925/cc10560b/attachment-0001.html>