on master help sign in
Merge branch 'master' into nightly
e8fb72fJens Petersen
Dockerfile+1−1
@@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
2
2
3ENV HOME /home/stackage
3ENV HOME /home/stackage
4ENV LANG en_US.UTF-8
4ENV LANG en_US.UTF-8
5−ENV GHCVER 8.10.5
5+ENV GHCVER 8.10.4
6
6
7# NOTE: also update debian-bootstrap.sh when cuda version changes
7# NOTE: also update debian-bootstrap.sh when cuda version changes
8ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
8ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
build-constraints.yaml+37−78
@@ -1,6 +1,6 @@
1ghc-major-version: "8.10"
1ghc-major-version: "8.10"
2# new curator is supposed to use exact GHC version
2# new curator is supposed to use exact GHC version
3−ghc-version: "8.10.5"
3+ghc-version: "8.10.4"
4
4
5# This affects which version of the Cabal file format we allow. We
5# This affects which version of the Cabal file format we allow. We
6# should ensure that this is always no greater than the version
6# should ensure that this is always no greater than the version
@@ -1048,13 +1048,13 @@ packages:
1048 - hspec-wai-json
1048 - hspec-wai-json
1049 - aeson-qq
1049 - aeson-qq
1050 - interpolate
1050 - interpolate
1051− - doctest < 0.17 # https://github.com/commercialhaskell/stackage/issues/5574
1051+ - doctest < 0.18 # https://github.com/commercialhaskell/stackage/issues/5574
1052 - base-compat
1052 - base-compat
1053
1053
1054 "Mario Blazevic <blamario@protonmail.com> @blamario":
1054 "Mario Blazevic <blamario@protonmail.com> @blamario":
1055 - monad-parallel
1055 - monad-parallel
1056 - monad-coroutine
1056 - monad-coroutine
1057− - monoid-subclasses < 1.1 # https://github.com/commercialhaskell/stackage/issues/5900
1057+ - monoid-subclasses
1058 - rank2classes
1058 - rank2classes
1059 - input-parsers
1059 - input-parsers
1060 - incremental-parser
1060 - incremental-parser
@@ -1489,8 +1489,8 @@ packages:
1489 - tracing-control < 0 # https://github.com/commercialhaskell/stackage/issues/5948
1489 - tracing-control < 0 # https://github.com/commercialhaskell/stackage/issues/5948
1490 - primitive-extras
1490 - primitive-extras
1491 - primitive-unlifted < 0.2
1491 - primitive-unlifted < 0.2
1492− - stm-hamt
1492+ - stm-hamt < 0 # mwc-random-0.15 https://github.com/nikita-volkov/stm-hamt/pull/2
1493− - stm-containers
1493+ - stm-containers < 0 # stm-hamt
1494 - stm-lifted
1494 - stm-lifted
1495 - monad-primitive
1495 - monad-primitive
1496 - mwc-random-monad
1496 - mwc-random-monad
@@ -1741,7 +1741,7 @@ packages:
1741 - xmlbf < 0 # MonadFail
1741 - xmlbf < 0 # MonadFail
1742
1742
1743 "Tomas Carnecky @wereHamster":
1743 "Tomas Carnecky @wereHamster":
1744− - avers
1744+ - avers < 0 # cryptonite-0.29
1745 - avers-api < 0 # via servant
1745 - avers-api < 0 # via servant
1746 - avers-server < 0 # via servant-server
1746 - avers-server < 0 # via servant-server
1747 - css-syntax
1747 - css-syntax
@@ -2998,13 +2998,14 @@ packages:
2998 - doclayout
2998 - doclayout
2999 - doctemplates
2999 - doctemplates
3000 - emojis
3000 - emojis
3001− - pandoc < 2.14 # https://github.com/commercialhaskell/stackage/issues/6053
3001+ - pandoc
3002 - citeproc
3002 - citeproc
3003− - commonmark < 0.2
3003+ - commonmark
3004− - commonmark-extensions < 0.2.1
3004+ - commonmark-extensions
3005− - commonmark-pandoc < 0.2.1
3005+ - commonmark-pandoc
3006+ - unicode-collation
3006 - HsYAML-aeson
3007 - HsYAML-aeson
3007− - ipynb #< 0 # via aeson-diff
3008+ - ipynb
3008
3009
3009 "Karun Ramakrishnan <karun012@gmail.com> @karun012":
3010 "Karun Ramakrishnan <karun012@gmail.com> @karun012":
3010 - doctest-discover
3011 - doctest-discover
@@ -3098,6 +3099,7 @@ packages:
3098 - ranged-list
3099 - ranged-list
3099 - c-enum
3100 - c-enum
3100 - c-struct
3101 - c-struct
3102+ - union-angle
3101
3103
3102 "Jan Gerlinger <git@jangerlinger.de> @JanGe":
3104 "Jan Gerlinger <git@jangerlinger.de> @JanGe":
3103 - irc-dcc < 0
3105 - irc-dcc < 0
@@ -3152,7 +3154,7 @@ packages:
3152 - sv < 0 # via base-4.13.0.0
3154 - sv < 0 # via base-4.13.0.0
3153 - sv-cassava < 0 # via sv-core
3155 - sv-cassava < 0 # via sv-core
3154 - sv-core < 0 # via base-4.13.0.0
3156 - sv-core < 0 # via base-4.13.0.0
3155− - tasty-hedgehog < 1.1.0.0 # https://github.com/commercialhaskell/stackage/issues/5973
3157+ - tasty-hedgehog
3156
3158
3157 "Ismail Mustafa <ismailmustafa@rocketmail.com> @ismailmustafa":
3159 "Ismail Mustafa <ismailmustafa@rocketmail.com> @ismailmustafa":
3158 - handwriting < 0
3160 - handwriting < 0
@@ -3233,6 +3235,7 @@ packages:
3233 - gi-graphene
3235 - gi-graphene
3234 - gi-gtk < 4
3236 - gi-gtk < 4
3235 - gi-gtk-hs
3237 - gi-gtk-hs
3238+ - gi-gmodule
3236 - gi-pango
3239 - gi-pango
3237 - gi-xlib
3240 - gi-xlib
3238 - gi-harfbuzz
3241 - gi-harfbuzz
@@ -3463,7 +3466,7 @@ packages:
3463 - tce-conf
3466 - tce-conf
3464
3467
3465 "Jonathan Fischoff <jonathangfischoff@gmail.com> @jfischoff":
3468 "Jonathan Fischoff <jonathangfischoff@gmail.com> @jfischoff":
3466− - clock-extras
3469+ - clock-extras < 0 # clock-0.8
3467 - postgres-options
3470 - postgres-options
3468 - tmp-postgres
3471 - tmp-postgres
3469 - pg-transact
3472 - pg-transact
@@ -3609,7 +3612,7 @@ packages:
3609
3612
3610 "Aditya Manthramurthy <aditya.mmy@gmail.com> @donatello":
3613 "Aditya Manthramurthy <aditya.mmy@gmail.com> @donatello":
3611 - minio-hs
3614 - minio-hs
3612− - webby
3615+ - webby < 0 # formatting-7
3613
3616
3614 "ncaq <ncaq@ncaq.net> @ncaq":
3617 "ncaq <ncaq@ncaq.net> @ncaq":
3615 - debug-trace-var
3618 - debug-trace-var
@@ -3756,7 +3759,7 @@ packages:
3756 - conduit-zstd
3759 - conduit-zstd
3757
3760
3758 "Alex Biehl <alexbiehl@gmail.com> @alexbiehl":
3761 "Alex Biehl <alexbiehl@gmail.com> @alexbiehl":
3759− - haddock-library < 1.10 # https://github.com/commercialhaskell/stackage/issues/5890
3762+ - haddock-library
3760 - http-client-openssl
3763 - http-client-openssl
3761
3764
3762 "Steven Vandevelde <icid.asset@gmail.com> @icidasset":
3765 "Steven Vandevelde <icid.asset@gmail.com> @icidasset":
@@ -4086,8 +4089,6 @@ packages:
4086 - servant-elm # ghc 8.10 via servant
4089 - servant-elm # ghc 8.10 via servant
4087 - systemd
4090 - systemd
4088
4091
4089−
4090−
4091 "Andre Van Der Merwe <stackage@andrevdm.com> @andrevdm":
4092 "Andre Van Der Merwe <stackage@andrevdm.com> @andrevdm":
4092 - bhoogle < 0
4093 - bhoogle < 0
4093 - hyraxAbif < 0 # ghc 8.10
4094 - hyraxAbif < 0 # ghc 8.10
@@ -4305,13 +4306,13 @@ packages:
4305
4306
4306 "David Himmelstrup <lemmih@gmail.com> @lemmih":
4307 "David Himmelstrup <lemmih@gmail.com> @lemmih":
4307 - chiphunk
4308 - chiphunk
4308− - reanimate-svg < 0 # via reanimate
4309+ - reanimate-svg
4309− - reanimate < 0 # via hgeometry & hgeometry-combinatorial
4310+ - reanimate
4310 - earcut
4311 - earcut
4311 - vector-circular
4312 - vector-circular
4312 # required by reanimate as of 0.4.2.0
4313 # required by reanimate as of 0.4.2.0
4313− - hgeometry < 0 # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886
4314+ - hgeometry >= 0.12.0.2
4314− - hgeometry-combinatorial < 0 # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886
4315+ - hgeometry-combinatorial
4315 - approximate-equality # required by hgeometry-combinatorial
4316 - approximate-equality # required by hgeometry-combinatorial
4316 - type-level-natural-number # required by approximate-equality
4317 - type-level-natural-number # required by approximate-equality
4317
4318
@@ -4344,9 +4345,9 @@ packages:
4344 "Ivan Malison <IvanMalison@gmail.com> @IvanMalison":
4345 "Ivan Malison <IvanMalison@gmail.com> @IvanMalison":
4345 - ConfigFile < 0 # random 1.2
4346 - ConfigFile < 0 # random 1.2
4346 - dbus-hslogger
4347 - dbus-hslogger
4347− - gi-cairo-connector
4348+ - gi-cairo-connector < 0 # haskell-gi-base-0.25
4348− - gi-cairo-render
4349+ - gi-cairo-render < 0 # haskell-gi-base-0.25
4349− - gtk-sni-tray
4350+ - gtk-sni-tray < 0 # gi-cairo-connector & gi-cairo-render
4350 - gtk-strut
4351 - gtk-strut
4351 - rate-limit
4352 - rate-limit
4352 - status-notifier-item
4353 - status-notifier-item
@@ -4823,6 +4824,7 @@ packages:
4823 - managed
4824 - managed
4824 - math-functions
4825 - math-functions
4825 - membrain
4826 - membrain
4827+ - mersenne-random
4826 - mersenne-random-pure64
4828 - mersenne-random-pure64
4827 - mfsolve
4829 - mfsolve
4828 - microstache
4830 - microstache
@@ -4837,7 +4839,7 @@ packages:
4837 - mono-traversable-instances
4839 - mono-traversable-instances
4838 - mono-traversable-keys
4840 - mono-traversable-keys
4839 - multiset
4841 - multiset
4840− - mwc-random < 0.15.0.0 # https://github.com/commercialhaskell/stackage/issues/5557
4842+ - mwc-random
4841 - names-th
4843 - names-th
4842 - nanospec
4844 - nanospec
4843 - nettle
4845 - nettle
@@ -5120,29 +5122,17 @@ packages:
5120 - network < 3.1.2.0
5122 - network < 3.1.2.0
5121 - dbus < 1.2.18
5123 - dbus < 1.2.18
5122
5124
5123− # https://github.com/commercialhaskell/stackage/issues/6013
5124− - path < 0.8
5125−
5126 # https://github.com/commercialhaskell/stackage/issues/5598
5125 # https://github.com/commercialhaskell/stackage/issues/5598
5127 - base64-bytestring < 1.2
5126 - base64-bytestring < 1.2
5128
5127
5129 # https://github.com/commercialhaskell/stackage/issues/5633
5128 # https://github.com/commercialhaskell/stackage/issues/5633
5130 - language-c < 0.9
5129 - language-c < 0.9
5131
5130
5132− # https://github.com/commercialhaskell/stackage/issues/5666
5133− - generic-deriving < 1.14
5134−
5135− # https://github.com/commercialhaskell/stackage/issues/5686
5136− - formatting < 7
5137−
5138 # https://github.com/commercialhaskell/stackage/issues/5747
5131 # https://github.com/commercialhaskell/stackage/issues/5747
5139 - http-client < 0.7
5132 - http-client < 0.7
5140 - http-client-openssl < 0.3.3
5133 - http-client-openssl < 0.3.3
5141 - req < 3.9.1
5134 - req < 3.9.1
5142
5135
5143− # https://github.com/commercialhaskell/stackage/issues/5836
5144− - clock < 0.8.2
5145−
5146 # https://github.com/commercialhaskell/stackage/issues/5864
5136 # https://github.com/commercialhaskell/stackage/issues/5864
5147 - parser-combinators < 1.3.0
5137 - parser-combinators < 1.3.0
5148 - parser-combinators-tests < 1.3.0
5138 - parser-combinators-tests < 1.3.0
@@ -5153,7 +5143,6 @@ packages:
5153 # https://github.com/commercialhaskell/stackage/issues/5911
5143 # https://github.com/commercialhaskell/stackage/issues/5911
5154 - lens < 5
5144 - lens < 5
5155
5145
5156−
5157 # https://github.com/commercialhaskell/stackage/issues/5878
5146 # https://github.com/commercialhaskell/stackage/issues/5878
5158 - hashable < 1.3.1.0
5147 - hashable < 1.3.1.0
5159 - mmark < 0.0.7.3
5148 - mmark < 0.0.7.3
@@ -5188,38 +5177,9 @@ packages:
5188 # https://github.com/commercialhaskell/stackage/issues/5959
5177 # https://github.com/commercialhaskell/stackage/issues/5959
5189 - attoparsec < 0.14.1
5178 - attoparsec < 0.14.1
5190
5179
5191− # https://github.com/commercialhaskell/stackage/issues/5962
5192− - haskell-gi-base < 0.25
5193− - haskell-gi < 0.25
5194− - gi-atk < 2.0.23
5195− - gi-cairo < 1.0.25
5196− - gi-dbusmenu < 0.4.9
5197− - gi-dbusmenugtk3 < 0.4.10
5198− - gi-gdk < 3.0.24
5199− - gi-gdkpixbuf < 2.0.25
5200− - gi-gdkx11 < 3.0.11
5201− - gi-gio < 2.0.28
5202− - gi-glib < 2.0.25
5203− - gi-gobject < 2.0.26
5204− - gi-graphene < 1.0.3
5205− - gi-gtk < 3.0.37
5206− - gi-gtk-hs < 0.3.10
5207− - gi-harfbuzz < 0.0.4
5208− - gi-pango < 1.0.24
5209− - gi-xlib <2.0.10
5210−
5211 # https://github.com/commercialhaskell/stackage/issues/5975
5180 # https://github.com/commercialhaskell/stackage/issues/5975
5212 - singleton-bool < 0.1.6
5181 - singleton-bool < 0.1.6
5213
5182
5214− # https://github.com/commercialhaskell/stackage/issues/5982
5215− - versions < 5.0
5216−
5217− # https://github.com/commercialhaskell/stackage/issues/5983
5218− - yesod-form < 1.7
5219−
5220− # https://github.com/commercialhaskell/stackage/issues/6006
5221− - cryptonite < 0.29
5222−
5223 # https://github.com/commercialhaskell/stackage/issues/6007
5183 # https://github.com/commercialhaskell/stackage/issues/6007
5224 - memory < 0.16
5184 - memory < 0.16
5225
5185
@@ -5234,28 +5194,20 @@ packages:
5234 - tasty-hspec < 1.1.7 # 1.1.7 re-exports cause breaks?
5194 - tasty-hspec < 1.1.7 # 1.1.7 re-exports cause breaks?
5235 - hspec-junit-formatter < 1.0.1.0 # https://github.com/commercialhaskell/stackage/issues/6024
5195 - hspec-junit-formatter < 1.0.1.0 # https://github.com/commercialhaskell/stackage/issues/6024
5236
5196
5237− # https://github.com/commercialhaskell/stackage/issues/6012
5238− - texmath < 0.12.3
5239− - citeproc < 0.4
5240−
5241 # https://github.com/commercialhaskell/stackage/issues/6020
5197 # https://github.com/commercialhaskell/stackage/issues/6020
5242 - call-stack < 0.4.0
5198 - call-stack < 0.4.0
5243
5199
5244− # https://github.com/commercialhaskell/stackage/issues/6042
5245− - jira-wiki-markup < 1.4
5246−
5247 # https://github.com/commercialhaskell/stackage/issues/5574
5200 # https://github.com/commercialhaskell/stackage/issues/5574
5248 # (doctest < 0.17)
5201 # (doctest < 0.17)
5249 - numhask < 0.8.0.0
5202 - numhask < 0.8.0.0
5250
5203
5251− # https://github.com/commercialhaskell/stackage/issues/6057
5252− - X11 < 1.10
5253−
5254# end of packages
5204# end of packages
5255
5205
5256# Package flags are applied to individual packages, and override the values of
5206# Package flags are applied to individual packages, and override the values of
5257# global-flags
5207# global-flags
5258package-flags:
5208package-flags:
5209+ hgeometry:
5210+ planargraph: false # Won't be required by version 0.13
5259 QuickCheck:
5211 QuickCheck:
5260 old-random: false
5212 old-random: false
5261 pathtype:
5213 pathtype:
@@ -5803,6 +5755,14 @@ skipped-tests:
5803 # was in expected test failures, but seems we may have to skip entirely for unknown reasons, previously: https://github.com/clash-lang/clash-compiler/issues/1622
5755 # was in expected test failures, but seems we may have to skip entirely for unknown reasons, previously: https://github.com/clash-lang/clash-compiler/issues/1622
5804 - clash-prelude
5756 - clash-prelude
5805
5757
5758+ # doctest-0.17: https://github.com/commercialhaskell/stackage/issues/5574
5759+ - asif
5760+ - email-validate
5761+ - polysemy
5762+ - polysemy-plugin
5763+ - servant-auth-docs
5764+ - shortcut-links
5765+
5806# end of skipped-tests
5766# end of skipped-tests
5807
5767
5808# Tests listed in expected-test-failures configure correctly but may fail to run
5768# Tests listed in expected-test-failures configure correctly but may fail to run
@@ -5974,7 +5934,6 @@ expected-test-failures:
5974 - kawhi # https://github.com/commercialhaskell/stackage/issues/4512
5934 - kawhi # https://github.com/commercialhaskell/stackage/issues/4512
5975 - loopbreaker # https://github.com/polysemy-research/loopbreaker/issues/10
5935 - loopbreaker # https://github.com/polysemy-research/loopbreaker/issues/10
5976 - nettle # https://github.com/stbuehler/haskell-nettle/issues/10
5936 - nettle # https://github.com/stbuehler/haskell-nettle/issues/10
5977− - persistent-mtl # https://github.com/commercialhaskell/stackage/issues/6036
5978 - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989
5937 - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989
5979 - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151
5938 - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151
5980 - simple-vec3 # https://github.com/commercialhaskell/stackage/pull/5410
5939 - simple-vec3 # https://github.com/commercialhaskell/stackage/pull/5410