diff --git a/ghc.mk b/ghc.mk index 9ab9e50d9b55e853845de02c985800f51bc205b8..81f2caacd0c8a31e268b63f9f4ea75d9718abdc8 100644 --- a/ghc.mk +++ b/ghc.mk @@ -430,6 +430,9 @@ 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 @@ -444,13 +447,10 @@ 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 index 310cdb90c925c35f962df9c690bd35e20136da26..ea3d88aafb7dac9d8a40a0d083adfa4b7153826d 160000 --- a/libraries/bytestring +++ b/libraries/bytestring @@ -1 +1 @@ -Subproject commit 310cdb90c925c35f962df9c690bd35e20136da26 +Subproject commit ea3d88aafb7dac9d8a40a0d083adfa4b7153826d diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout index 6a7f79ae37bc89833b9c34548db0e6dbccd3375b..e739dafb01713fc453d082baca37448705e4bb79 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout +++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout @@ -19,7 +19,7 @@ trusted: safe require own pkg trusted: True M_SafePkg4 -package dependencies: base-4.16.1.0* ghc-bignum-1.2 ghc-prim-0.8.0 +package dependencies: base-4.16.0.0* ghc-bignum-1.2 ghc-prim-0.8.0 trusted: safe require own pkg trusted: True @@ -29,17 +29,17 @@ trusted: safe-inferred require own pkg trusted: True M_SafePkg6 -package dependencies: array-0.5.4.0 base-4.16.1.0* bytestring-0.11.1.0* deepseq-1.4.6.1 ghc-bignum-1.2 ghc-prim-0.8.0 +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 trusted: trustworthy require own pkg trusted: False M_SafePkg7 -package dependencies: array-0.5.4.0 base-4.16.1.0* bytestring-0.11.1.0* deepseq-1.4.6.1 ghc-bignum-1.2 ghc-prim-0.8.0 +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 trusted: safe require own pkg trusted: False M_SafePkg8 -package dependencies: array-0.5.4.0 base-4.16.1.0 bytestring-0.11.1.0* deepseq-1.4.6.1 ghc-bignum-1.2 ghc-prim-0.8.0 +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 trusted: trustworthy require own pkg trusted: False