mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-11 23:08:30 +01:00
Merge branch 'master' into nightly
This commit is contained in:
commit
e8fb72f5fd
@ -2,7 +2,7 @@ FROM fpco/pid1:18.04
|
||||
|
||||
ENV HOME /home/stackage
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV GHCVER 8.10.5
|
||||
ENV GHCVER 8.10.4
|
||||
|
||||
# NOTE: also update debian-bootstrap.sh when cuda version changes
|
||||
ENV PATH /home/stackage/.stack/programs/x86_64-linux/ghc-$GHCVER/bin:/usr/local/cuda-10.0/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
ghc-major-version: "8.10"
|
||||
# new curator is supposed to use exact GHC version
|
||||
ghc-version: "8.10.5"
|
||||
ghc-version: "8.10.4"
|
||||
|
||||
# This affects which version of the Cabal file format we allow. We
|
||||
# should ensure that this is always no greater than the version
|
||||
@ -1048,13 +1048,13 @@ packages:
|
||||
- hspec-wai-json
|
||||
- aeson-qq
|
||||
- interpolate
|
||||
- doctest < 0.17 # https://github.com/commercialhaskell/stackage/issues/5574
|
||||
- doctest < 0.18 # https://github.com/commercialhaskell/stackage/issues/5574
|
||||
- base-compat
|
||||
|
||||
"Mario Blazevic <blamario@protonmail.com> @blamario":
|
||||
- monad-parallel
|
||||
- monad-coroutine
|
||||
- monoid-subclasses < 1.1 # https://github.com/commercialhaskell/stackage/issues/5900
|
||||
- monoid-subclasses
|
||||
- rank2classes
|
||||
- input-parsers
|
||||
- incremental-parser
|
||||
@ -1489,8 +1489,8 @@ packages:
|
||||
- tracing-control < 0 # https://github.com/commercialhaskell/stackage/issues/5948
|
||||
- primitive-extras
|
||||
- primitive-unlifted < 0.2
|
||||
- stm-hamt
|
||||
- stm-containers
|
||||
- stm-hamt < 0 # mwc-random-0.15 https://github.com/nikita-volkov/stm-hamt/pull/2
|
||||
- stm-containers < 0 # stm-hamt
|
||||
- stm-lifted
|
||||
- monad-primitive
|
||||
- mwc-random-monad
|
||||
@ -1741,7 +1741,7 @@ packages:
|
||||
- xmlbf < 0 # MonadFail
|
||||
|
||||
"Tomas Carnecky @wereHamster":
|
||||
- avers
|
||||
- avers < 0 # cryptonite-0.29
|
||||
- avers-api < 0 # via servant
|
||||
- avers-server < 0 # via servant-server
|
||||
- css-syntax
|
||||
@ -2998,13 +2998,14 @@ packages:
|
||||
- doclayout
|
||||
- doctemplates
|
||||
- emojis
|
||||
- pandoc < 2.14 # https://github.com/commercialhaskell/stackage/issues/6053
|
||||
- pandoc
|
||||
- citeproc
|
||||
- commonmark < 0.2
|
||||
- commonmark-extensions < 0.2.1
|
||||
- commonmark-pandoc < 0.2.1
|
||||
- commonmark
|
||||
- commonmark-extensions
|
||||
- commonmark-pandoc
|
||||
- unicode-collation
|
||||
- HsYAML-aeson
|
||||
- ipynb #< 0 # via aeson-diff
|
||||
- ipynb
|
||||
|
||||
"Karun Ramakrishnan <karun012@gmail.com> @karun012":
|
||||
- doctest-discover
|
||||
@ -3098,6 +3099,7 @@ packages:
|
||||
- ranged-list
|
||||
- c-enum
|
||||
- c-struct
|
||||
- union-angle
|
||||
|
||||
"Jan Gerlinger <git@jangerlinger.de> @JanGe":
|
||||
- irc-dcc < 0
|
||||
@ -3152,7 +3154,7 @@ packages:
|
||||
- sv < 0 # via base-4.13.0.0
|
||||
- sv-cassava < 0 # via sv-core
|
||||
- sv-core < 0 # via base-4.13.0.0
|
||||
- tasty-hedgehog < 1.1.0.0 # https://github.com/commercialhaskell/stackage/issues/5973
|
||||
- tasty-hedgehog
|
||||
|
||||
"Ismail Mustafa <ismailmustafa@rocketmail.com> @ismailmustafa":
|
||||
- handwriting < 0
|
||||
@ -3233,6 +3235,7 @@ packages:
|
||||
- gi-graphene
|
||||
- gi-gtk < 4
|
||||
- gi-gtk-hs
|
||||
- gi-gmodule
|
||||
- gi-pango
|
||||
- gi-xlib
|
||||
- gi-harfbuzz
|
||||
@ -3463,7 +3466,7 @@ packages:
|
||||
- tce-conf
|
||||
|
||||
"Jonathan Fischoff <jonathangfischoff@gmail.com> @jfischoff":
|
||||
- clock-extras
|
||||
- clock-extras < 0 # clock-0.8
|
||||
- postgres-options
|
||||
- tmp-postgres
|
||||
- pg-transact
|
||||
@ -3609,7 +3612,7 @@ packages:
|
||||
|
||||
"Aditya Manthramurthy <aditya.mmy@gmail.com> @donatello":
|
||||
- minio-hs
|
||||
- webby
|
||||
- webby < 0 # formatting-7
|
||||
|
||||
"ncaq <ncaq@ncaq.net> @ncaq":
|
||||
- debug-trace-var
|
||||
@ -3756,7 +3759,7 @@ packages:
|
||||
- conduit-zstd
|
||||
|
||||
"Alex Biehl <alexbiehl@gmail.com> @alexbiehl":
|
||||
- haddock-library < 1.10 # https://github.com/commercialhaskell/stackage/issues/5890
|
||||
- haddock-library
|
||||
- http-client-openssl
|
||||
|
||||
"Steven Vandevelde <icid.asset@gmail.com> @icidasset":
|
||||
@ -4086,8 +4089,6 @@ packages:
|
||||
- servant-elm # ghc 8.10 via servant
|
||||
- systemd
|
||||
|
||||
|
||||
|
||||
"Andre Van Der Merwe <stackage@andrevdm.com> @andrevdm":
|
||||
- bhoogle < 0
|
||||
- hyraxAbif < 0 # ghc 8.10
|
||||
@ -4305,13 +4306,13 @@ packages:
|
||||
|
||||
"David Himmelstrup <lemmih@gmail.com> @lemmih":
|
||||
- chiphunk
|
||||
- reanimate-svg < 0 # via reanimate
|
||||
- reanimate < 0 # via hgeometry & hgeometry-combinatorial
|
||||
- reanimate-svg
|
||||
- reanimate
|
||||
- earcut
|
||||
- vector-circular
|
||||
# required by reanimate as of 0.4.2.0
|
||||
- hgeometry < 0 # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886
|
||||
- hgeometry-combinatorial < 0 # via vector-0.12.2.0 https://github.com/commercialhaskell/stackage/issues/5886
|
||||
- hgeometry >= 0.12.0.2
|
||||
- hgeometry-combinatorial
|
||||
- approximate-equality # required by hgeometry-combinatorial
|
||||
- type-level-natural-number # required by approximate-equality
|
||||
|
||||
@ -4344,9 +4345,9 @@ packages:
|
||||
"Ivan Malison <IvanMalison@gmail.com> @IvanMalison":
|
||||
- ConfigFile < 0 # random 1.2
|
||||
- dbus-hslogger
|
||||
- gi-cairo-connector
|
||||
- gi-cairo-render
|
||||
- gtk-sni-tray
|
||||
- gi-cairo-connector < 0 # haskell-gi-base-0.25
|
||||
- gi-cairo-render < 0 # haskell-gi-base-0.25
|
||||
- gtk-sni-tray < 0 # gi-cairo-connector & gi-cairo-render
|
||||
- gtk-strut
|
||||
- rate-limit
|
||||
- status-notifier-item
|
||||
@ -4823,6 +4824,7 @@ packages:
|
||||
- managed
|
||||
- math-functions
|
||||
- membrain
|
||||
- mersenne-random
|
||||
- mersenne-random-pure64
|
||||
- mfsolve
|
||||
- microstache
|
||||
@ -4837,7 +4839,7 @@ packages:
|
||||
- mono-traversable-instances
|
||||
- mono-traversable-keys
|
||||
- multiset
|
||||
- mwc-random < 0.15.0.0 # https://github.com/commercialhaskell/stackage/issues/5557
|
||||
- mwc-random
|
||||
- names-th
|
||||
- nanospec
|
||||
- nettle
|
||||
@ -5120,29 +5122,17 @@ packages:
|
||||
- network < 3.1.2.0
|
||||
- dbus < 1.2.18
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6013
|
||||
- path < 0.8
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5598
|
||||
- base64-bytestring < 1.2
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5633
|
||||
- language-c < 0.9
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5666
|
||||
- generic-deriving < 1.14
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5686
|
||||
- formatting < 7
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5747
|
||||
- http-client < 0.7
|
||||
- http-client-openssl < 0.3.3
|
||||
- req < 3.9.1
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5836
|
||||
- clock < 0.8.2
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5864
|
||||
- parser-combinators < 1.3.0
|
||||
- parser-combinators-tests < 1.3.0
|
||||
@ -5153,7 +5143,6 @@ packages:
|
||||
# https://github.com/commercialhaskell/stackage/issues/5911
|
||||
- lens < 5
|
||||
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5878
|
||||
- hashable < 1.3.1.0
|
||||
- mmark < 0.0.7.3
|
||||
@ -5188,38 +5177,9 @@ packages:
|
||||
# https://github.com/commercialhaskell/stackage/issues/5959
|
||||
- attoparsec < 0.14.1
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5962
|
||||
- haskell-gi-base < 0.25
|
||||
- haskell-gi < 0.25
|
||||
- gi-atk < 2.0.23
|
||||
- gi-cairo < 1.0.25
|
||||
- gi-dbusmenu < 0.4.9
|
||||
- gi-dbusmenugtk3 < 0.4.10
|
||||
- gi-gdk < 3.0.24
|
||||
- gi-gdkpixbuf < 2.0.25
|
||||
- gi-gdkx11 < 3.0.11
|
||||
- gi-gio < 2.0.28
|
||||
- gi-glib < 2.0.25
|
||||
- gi-gobject < 2.0.26
|
||||
- gi-graphene < 1.0.3
|
||||
- gi-gtk < 3.0.37
|
||||
- gi-gtk-hs < 0.3.10
|
||||
- gi-harfbuzz < 0.0.4
|
||||
- gi-pango < 1.0.24
|
||||
- gi-xlib <2.0.10
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5975
|
||||
- singleton-bool < 0.1.6
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5982
|
||||
- versions < 5.0
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5983
|
||||
- yesod-form < 1.7
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6006
|
||||
- cryptonite < 0.29
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6007
|
||||
- memory < 0.16
|
||||
|
||||
@ -5234,28 +5194,20 @@ packages:
|
||||
- tasty-hspec < 1.1.7 # 1.1.7 re-exports cause breaks?
|
||||
- hspec-junit-formatter < 1.0.1.0 # https://github.com/commercialhaskell/stackage/issues/6024
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6012
|
||||
- texmath < 0.12.3
|
||||
- citeproc < 0.4
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6020
|
||||
- call-stack < 0.4.0
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6042
|
||||
- jira-wiki-markup < 1.4
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/5574
|
||||
# (doctest < 0.17)
|
||||
- numhask < 0.8.0.0
|
||||
|
||||
# https://github.com/commercialhaskell/stackage/issues/6057
|
||||
- X11 < 1.10
|
||||
|
||||
# end of packages
|
||||
|
||||
# Package flags are applied to individual packages, and override the values of
|
||||
# global-flags
|
||||
package-flags:
|
||||
hgeometry:
|
||||
planargraph: false # Won't be required by version 0.13
|
||||
QuickCheck:
|
||||
old-random: false
|
||||
pathtype:
|
||||
@ -5803,6 +5755,14 @@ skipped-tests:
|
||||
# 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
|
||||
- clash-prelude
|
||||
|
||||
# doctest-0.17: https://github.com/commercialhaskell/stackage/issues/5574
|
||||
- asif
|
||||
- email-validate
|
||||
- polysemy
|
||||
- polysemy-plugin
|
||||
- servant-auth-docs
|
||||
- shortcut-links
|
||||
|
||||
# end of skipped-tests
|
||||
|
||||
# Tests listed in expected-test-failures configure correctly but may fail to run
|
||||
@ -5974,7 +5934,6 @@ expected-test-failures:
|
||||
- kawhi # https://github.com/commercialhaskell/stackage/issues/4512
|
||||
- loopbreaker # https://github.com/polysemy-research/loopbreaker/issues/10
|
||||
- nettle # https://github.com/stbuehler/haskell-nettle/issues/10
|
||||
- persistent-mtl # https://github.com/commercialhaskell/stackage/issues/6036
|
||||
- persistent-sqlite # https://github.com/yesodweb/persistent/issues/989
|
||||
- haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151
|
||||
- simple-vec3 # https://github.com/commercialhaskell/stackage/pull/5410
|
||||
|
||||
Loading…
Reference in New Issue
Block a user