summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-02-09 09:07:16 +0000
committerMatthew Pickering <matthewtpickering@gmail.com>2022-02-10 13:55:37 +0000
commit73c58ffdbfeaeb18388c8bc05de0eb9901453c51 (patch)
treee4fe7536034a8eb00baa539fa523474e5b983ca3
parenteb676fd4b3849449a0a709254eeec413133e66b2 (diff)
downloadhaskell-73c58ffdbfeaeb18388c8bc05de0eb9901453c51.tar.gz
Revert "Bump bytestring submodule to 0.11.2.0"
This reverts commit 85dbf1cac30cbff5c4f296a792860f18ff30572e.
-rw-r--r--ghc.mk6
m---------libraries/bytestring0
-rw-r--r--testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout16
3 files changed, 11 insertions, 11 deletions
diff --git a/ghc.mk b/ghc.mk
index 81f2caacd0..9ab9e50d9b 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -430,9 +430,6 @@ PACKAGES_STAGE1 += base
PACKAGES_STAGE1 += filepath
PACKAGES_STAGE1 += array
PACKAGES_STAGE1 += deepseq
-PACKAGES_STAGE1 += pretty
-PACKAGES_STAGE1 += ghc-boot-th
-PACKAGES_STAGE1 += template-haskell
PACKAGES_STAGE1 += bytestring
PACKAGES_STAGE1 += containers/containers
@@ -447,10 +444,13 @@ endif
PACKAGES_STAGE1 += directory
PACKAGES_STAGE1 += process
PACKAGES_STAGE1 += hpc
+PACKAGES_STAGE1 += pretty
PACKAGES_STAGE1 += binary
PACKAGES_STAGE1 += transformers
PACKAGES_STAGE1 += mtl
+PACKAGES_STAGE1 += ghc-boot-th
PACKAGES_STAGE1 += ghc-boot
+PACKAGES_STAGE1 += template-haskell
PACKAGES_STAGE1 += text
PACKAGES_STAGE1 += parsec
PACKAGES_STAGE1 += Cabal/Cabal
diff --git a/libraries/bytestring b/libraries/bytestring
-Subproject e84481a06ae4b50984469a79f2c1af4b2f02029
+Subproject 310cdb90c925c35f962df9c690bd35e20136da2
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index e123ced403..f2d60007a1 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -4,42 +4,42 @@ pdb.safePkg01/local.db
trusted: False
M_SafePkg
-package dependencies: base-4.16.0.0* ghc-bignum-1.2 ghc-prim-0.8.0
+package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.7.0
trusted: safe
require own pkg trusted: False
M_SafePkg2
-package dependencies: base-4.16.0.0 ghc-bignum-1.2 ghc-prim-0.8.0
+package dependencies: base-4.13.0.0 ghc-bignum-1.0 ghc-prim-0.7.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg3
-package dependencies: base-4.16.0.0* ghc-bignum-1.2 ghc-prim-0.8.0
+package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.7.0
trusted: safe
require own pkg trusted: True
M_SafePkg4
-package dependencies: base-4.16.0.0* ghc-bignum-1.2 ghc-prim-0.8.0
+package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.7.0
trusted: safe
require own pkg trusted: True
M_SafePkg5
-package dependencies: base-4.16.0.0* ghc-bignum-1.2 ghc-prim-0.8.0
+package dependencies: base-4.13.0.0* ghc-bignum-1.0 ghc-prim-0.7.0
trusted: safe-inferred
require own pkg trusted: True
M_SafePkg6
-package dependencies: array-0.5.4.0 base-4.16.0.0* bytestring-0.11.2.0* deepseq-1.4.6.0 ghc-bignum-1.2 ghc-boot-th-9.2.1.20220131 ghc-prim-0.8.0 template-haskell-2.18.0.0
+package dependencies: array-0.5.4.0 base-4.13.0.0* bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-bignum-1.0 ghc-prim-0.7.0
trusted: trustworthy
require own pkg trusted: False
M_SafePkg7
-package dependencies: array-0.5.4.0 base-4.16.0.0* bytestring-0.11.2.0* deepseq-1.4.6.0 ghc-bignum-1.2 ghc-boot-th-9.2.1.20220131 ghc-prim-0.8.0 template-haskell-2.18.0.0
+package dependencies: array-0.5.4.0 base-4.13.0.0* bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-bignum-1.0 ghc-prim-0.7.0
trusted: safe
require own pkg trusted: False
M_SafePkg8
-package dependencies: array-0.5.4.0 base-4.16.0.0 bytestring-0.11.2.0* deepseq-1.4.6.0 ghc-bignum-1.2 ghc-boot-th-9.2.1.20220131 ghc-prim-0.8.0 template-haskell-2.18.0.0
+package dependencies: array-0.5.4.0 base-4.13.0.0 bytestring-0.10.9.0* deepseq-1.4.4.0 ghc-bignum-1.0 ghc-prim-0.7.0
trusted: trustworthy
require own pkg trusted: False