diff options
author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-11-15 12:16:38 +0100 |
---|---|---|
committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-11-15 12:20:03 +0100 |
commit | 609cd28a1a8616f4076088c87e443850d807ba7d (patch) | |
tree | 7d6979b50f3c2660387e85c2e96dc874ff63fd58 | |
parent | 185482524d4fa5954243476de1452219fb077228 (diff) | |
download | haskell-609cd28a1a8616f4076088c87e443850d807ba7d.tar.gz |
Update to (unreleased) `deepseq-1.4.0.0`
This pulls in the new `Generic`-based `-XDefaultSignature`-based default
implementation for `rnf`[1], and will be interesting to use in combination
with the soon to be merged `-XDeriveAnyClass` extension.
This requires updating several other submodules as well in order
to relax the upper bound on `deepseq` and/or in a few cases to
avoid relying on the default method implementation of `rnf`:
- `Cabal`
- `bytestring`
- `containers`
- `parallel`
- `process`
- `time`
[1]: http://permalink.gmane.org/gmane.comp.lang.haskell.libraries/23031
m--------- | libraries/Cabal | 0 | ||||
m--------- | libraries/bytestring | 0 | ||||
m--------- | libraries/containers | 0 | ||||
m--------- | libraries/deepseq | 0 | ||||
m--------- | libraries/parallel | 0 | ||||
m--------- | libraries/process | 0 | ||||
m--------- | libraries/time | 0 | ||||
-rw-r--r-- | mk/validate-settings.mk | 3 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/Check09.stderr | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr | 2 | ||||
-rw-r--r-- | testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 6 | ||||
m--------- | utils/haddock | 0 |
14 files changed, 10 insertions, 7 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 1f8a0a20c7a010b50fbafc0effde9bcd663d871 +Subproject f54e7f95412c2ee9ee76ce9517b7d8aa769bdcf diff --git a/libraries/bytestring b/libraries/bytestring -Subproject 6ad8c0d27bcff28c80684a29b57d7a8dbf00cac +Subproject 7a7602a142a1deae2e4f73782d88a91f39a0fa9 diff --git a/libraries/containers b/libraries/containers -Subproject 530fc76bdd17089fcaaa655d66156abbc2092c2 +Subproject c802c36dbed4b800d8c2131181f5af3db837ade diff --git a/libraries/deepseq b/libraries/deepseq -Subproject 3815fe819ba465159cc618b3521adcba97e3c0d +Subproject 75ce5767488774065025df34cbc80de6f03c4fd diff --git a/libraries/parallel b/libraries/parallel -Subproject 94e1aa6f621df464c237c9987bb7f65bd4cb5ff +Subproject 50a2b2a622898786d623a9f933183525305058d diff --git a/libraries/process b/libraries/process -Subproject 7b3ede7dbbb2de80b906c76f747d0b3196c4669 +Subproject bc5f2348b982d9e86bf2f15065187a0ba535a1a diff --git a/libraries/time b/libraries/time -Subproject 991e6be84974b02d7f968601ab02d2e2b3e1419 +Subproject ab6475cb94260f4303afbbd4b770cbd14ec2f57 diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index 150aec3323..cce50638dc 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -108,6 +108,9 @@ libraries/stm_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports libraries/parallel_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports libraries/vector_dist-install_EXTRA_HC_OPTS += -fno-warn-unused-imports +# haddock's attoparsec uses deprecated `inlinePerformIO` +utils/haddock_dist_EXTRA_HC_OPTS += -fno-warn-deprecations + # bytestring has identities at the moment libraries/bytestring_dist-install_EXTRA_HC_OPTS += -fno-warn-identities diff --git a/testsuite/tests/safeHaskell/check/Check09.stderr b/testsuite/tests/safeHaskell/check/Check09.stderr index 6954dd1f89..75803cf80d 100644 --- a/testsuite/tests/safeHaskell/check/Check09.stderr +++ b/testsuite/tests/safeHaskell/check/Check09.stderr @@ -5,4 +5,4 @@ Check09.hs:4:1: Check09.hs:5:1: Data.ByteString.Char8: Can't be safely imported! - The package (bytestring-0.10.4.0) the module resides in isn't trusted. + The package (bytestring-0.10.5.0) the module resides in isn't trusted. diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr index 2fdf45ce13..0a012f7105 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr @@ -1,4 +1,4 @@ [2 of 2] Compiling Main ( ImpSafe03.hs, ImpSafe03.o ) <no location info>: - The package (bytestring-0.10.4.0) is required to be trusted but it isn't! + The package (bytestring-0.10.5.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr index 884f080866..3dd6759d2f 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr @@ -3,4 +3,4 @@ The package (base-4.8.0.0) is required to be trusted but it isn't! <no location info>: - The package (bytestring-0.10.4.0) is required to be trusted but it isn't! + The package (bytestring-0.10.5.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr index 884f080866..3dd6759d2f 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr @@ -3,4 +3,4 @@ The package (base-4.8.0.0) is required to be trusted but it isn't! <no location info>: - The package (bytestring-0.10.4.0) is required to be trusted but it isn't! + The package (bytestring-0.10.5.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout index 44ea89fec9..1567b60dda 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout +++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout @@ -29,17 +29,17 @@ trusted: safe require own pkg trusted: True M_SafePkg6 -package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0 +package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.5.0* deepseq-1.4.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0 trusted: trustworthy require own pkg trusted: False M_SafePkg7 -package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0 +package dependencies: array-0.5.0.1 base-4.8.0.0* bytestring-0.10.5.0* deepseq-1.4.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0 trusted: safe require own pkg trusted: False M_SafePkg8 -package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.4.0* deepseq-1.3.0.3 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0 +package dependencies: array-0.5.0.1 base-4.8.0.0 bytestring-0.10.5.0* deepseq-1.4.0.0 ghc-prim-0.3.1.0 integer-gmp-0.5.1.0 trusted: trustworthy require own pkg trusted: False diff --git a/utils/haddock b/utils/haddock -Subproject 199936af5bb902c81f822b2dc57308dc25e18cf +Subproject 9cdf19bad54a6cc4b322396fdd06f4c1ee045b2 |