Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-04-30 15:52:19 +02:00
237 changed files with 8482 additions and 2711 deletions
@@ -1282,4 +1282,10 @@ self: super: {
# Break out of pandoc >=2.0 && <2.7 (https://github.com/pbrisbin/yesod-markdown/pull/65)
yesod-markdown = doJailbreak super.yesod-markdown;
# These packages needs network 3.x, which is not in LTS-13.x.
network-bsd = super.network-bsd.override { network = self.network_3_0_1_1; };
lambdabot-core = super.lambdabot-core.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-reference-plugins = super.lambdabot-reference-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; hslogger = self.hslogger_1_3_0_0; });
lambdabot-haskell-plugins = super.lambdabot-haskell-plugins.overrideScope (self: super: { network = self.network_3_0_1_1; socks = self.socks_0_6_0; connection = self.connection_0_3_0; haskell-src-exts = self.haskell-src-exts_1_21_0; });
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
@@ -4,8 +4,8 @@ with haskellLib;
self: super: {
# This compiler version needs llvm 5.x.
llvmPackages = pkgs.llvmPackages_5;
# This compiler version needs llvm 6.x.
llvmPackages = pkgs.llvmPackages_6;
# Disable GHC 8.6.x core libraries.
array = null;
@@ -0,0 +1,58 @@
{ pkgs, haskellLib }:
with haskellLib;
self: super: {
# This compiler version needs llvm 7.x.
llvmPackages = pkgs.llvmPackages_7;
# Disable GHC 8.8.x core libraries.
array = null;
base = null;
binary = null;
bytestring = null;
Cabal = null;
containers = null;
deepseq = null;
directory = null;
filepath = null;
ghc-boot = null;
ghc-boot-th = null;
ghc-compact = null;
ghc-heap = null;
ghc-prim = null;
ghci = null;
haskeline = null;
hpc = null;
integer-gmp = null;
libiserv = null;
mtl = null;
parsec = null;
pretty = null;
process = null;
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
text = null;
time = null;
transformers = null;
unix = null;
xhtml = null;
# Ignore overly restrictive upper version bounds.
doctest = doJailbreak super.doctest;
# These packages don't work and need patching and/or an update.
primitive = overrideSrc (doJailbreak super.primitive) {
version = "20180530-git";
src = pkgs.fetchFromGitHub {
owner = "haskell";
repo = "primitive";
rev = "97964182881aa0419546e0bb188b2d17e4468324";
sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
};
};
}
@@ -1,6 +1,6 @@
# pkgs/development/haskell-modules/configuration-hackage2nix.yaml
compiler: ghc-8.6.4
compiler: ghc-8.6.5
core-packages:
- array-0.5.3.0
@@ -12,13 +12,13 @@ core-packages:
- deepseq-1.4.4.0
- directory-1.3.3.0
- filepath-1.4.2.1
- ghc-8.6.4
- ghc-boot-8.6.4
- ghc-boot-th-8.6.4
- ghc-8.6.5
- ghc-boot-8.6.5
- ghc-boot-th-8.6.5
- ghc-compact-0.1.0.0
- ghc-heap-8.6.4
- ghc-heap-8.6.5
- ghc-prim-0.5.3
- ghci-8.6.4
- ghci-8.6.5
- haskeline-0.7.4.3
- hpc-0.6.0.3
- integer-gmp-1.0.2.0
@@ -46,7 +46,7 @@ default-package-overrides:
# Newer versions don't work in LTS-12.x
- alsa-mixer < 0.3
- cassava-megaparsec < 2
# LTS Haskell 13.18
# LTS Haskell 13.19
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@@ -179,7 +179,7 @@ default-package-overrides:
- amazonka-waf ==1.6.1
- amazonka-workspaces ==1.6.1
- amazonka-xray ==1.6.1
- amqp ==0.18.1
- amqp ==0.18.2
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.8.2
- ansi-wl-pprint ==0.6.8.2
@@ -269,7 +269,7 @@ default-package-overrides:
- bencode ==0.6.0.0
- between ==0.11.0.0
- bibtex ==0.1.0.6
- bifunctors ==5.5.3
- bifunctors ==5.5.4
- bimap ==0.3.3
- bimap-server ==0.1.0.1
- binary-bits ==0.5
@@ -316,7 +316,7 @@ default-package-overrides:
- boolean-normal-forms ==0.0.1
- boolsimplifier ==0.1.8
- bordacount ==0.1.0.0
- boring ==0.1
- boring ==0.1.1
- both ==0.1.1.0
- bound ==2.0.1
- BoundedChan ==1.0.3.0
@@ -563,7 +563,7 @@ default-package-overrides:
- DAV ==1.3.3
- dbcleaner ==0.1.3
- DBFunctor ==0.1.1.1
- dbus ==1.2.5
- dbus ==1.2.6
- debian-build ==0.10.1.2
- debug ==0.1.1
- debug-trace-var ==0.2.0
@@ -579,7 +579,7 @@ default-package-overrides:
- dependent-sum-template ==0.0.0.6
- deque ==0.2.7
- deriveJsonNoPrefix ==0.1.0.1
- deriving-compat ==0.5.4
- deriving-compat ==0.5.5
- derulo ==1.0.5
- detour-via-sci ==1.0.0
- dhall ==1.19.1
@@ -651,7 +651,7 @@ default-package-overrides:
- ekg-statsd ==0.2.4.0
- elerea ==2.9.0
- elf ==0.29
- eliminators ==0.5
- eliminators ==0.5.1
- elm2nix ==0.1.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
@@ -698,7 +698,7 @@ default-package-overrides:
- explicit-exception ==0.1.9.2
- exp-pairs ==0.2.0.0
- extensible-exceptions ==0.1.1.4
- extra ==1.6.14
- extra ==1.6.15
- extractable-singleton ==0.0.1
- extrapolate ==0.3.3
- fail ==4.9.0.0
@@ -725,7 +725,7 @@ default-package-overrides:
- fileplow ==0.1.0.0
- filter-logger ==0.6.0.0
- filtrable ==0.1.1.0
- fin ==0.0.1
- fin ==0.0.2
- FindBin ==0.0.5
- fingertree ==0.1.4.2
- finite-typelits ==0.1.4.2
@@ -788,7 +788,7 @@ default-package-overrides:
- general-games ==1.1.1
- generic-arbitrary ==0.1.0
- generic-data ==0.3.0.0
- generic-deriving ==1.12.3
- generic-deriving ==1.12.4
- generic-lens ==1.1.0.0
- GenericPretty ==1.2.2
- generic-random ==1.2.0.0
@@ -896,7 +896,7 @@ default-package-overrides:
- HandsomeSoup ==0.4.2
- hapistrano ==0.3.9.2
- happy ==1.19.9
- hasbolt ==0.1.3.2
- hasbolt ==0.1.3.3
- hashable ==1.2.7.0
- hashable-time ==0.2.0.2
- hashids ==1.0.2.4
@@ -918,9 +918,9 @@ default-package-overrides:
- haskell-src-meta ==0.8.2
- haskey-btree ==0.3.0.0
- haskoin-core ==0.8.4
- hasql ==1.3.0.3
- hasql ==1.3.0.5
- hasql-optparse-applicative ==0.3.0.3
- hasql-pool ==0.5.0.1
- hasql-pool ==0.5.0.2
- hasql-transaction ==0.7.1
- hasty-hamiltonian ==1.3.2
- haxl ==2.0.1.1
@@ -963,7 +963,7 @@ default-package-overrides:
- hmatrix-gsl ==0.19.0.1
- hmatrix-gsl-stats ==0.4.1.7
- hmatrix-morpheus ==0.1.1.2
- hmatrix-vector-sized ==0.1.1.2
- hmatrix-vector-sized ==0.1.1.3
- hmpfr ==0.4.4
- hoauth2 ==1.8.4
- Hoed ==0.5.1
@@ -1130,7 +1130,7 @@ default-package-overrides:
- IntervalMap ==0.6.1.1
- intervals ==0.8.1
- intset-imperative ==0.1.0.0
- invariant ==0.5.1
- invariant ==0.5.2
- invertible ==0.2.0.5
- io-choice ==0.0.7
- io-machine ==0.2.0.0
@@ -1212,7 +1212,7 @@ default-package-overrides:
- leancheck ==0.8.0
- leancheck-instances ==0.0.3
- leapseconds-announced ==2017.1.0.1
- lens ==4.17
- lens ==4.17.1
- lens-action ==0.2.3
- lens-aeson ==1.0.2
- lens-datetime ==0.3
@@ -1264,7 +1264,7 @@ default-package-overrides:
- long-double ==0.1
- loop ==0.3.0
- lrucaching ==0.3.3
- lsp-test ==0.5.1.1
- lsp-test ==0.5.1.2
- lucid ==2.9.11
- lucid-extras ==0.1.0.1
- lxd-client-config ==0.1.0.1
@@ -1414,7 +1414,7 @@ default-package-overrides:
- netwire ==5.0.3
- netwire-input ==0.0.7
- netwire-input-glfw ==0.0.10
- network ==2.8.0.0
- network ==2.8.0.1
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
- network-attoparsec ==0.12.2
@@ -1485,7 +1485,7 @@ default-package-overrides:
- options ==1.2.1.1
- optparse-applicative ==0.14.3.0
- optparse-generic ==1.3.0
- optparse-simple ==0.1.1.1
- optparse-simple ==0.1.1.2
- optparse-text ==0.1.1.0
- overhang ==1.0.0
- packcheck ==0.4.1
@@ -1574,13 +1574,13 @@ default-package-overrides:
- polynomials-bernstein ==1.1.2
- polyparse ==1.12.1
- pooled-io ==0.0.2.2
- port-utils ==0.2.0.0
- port-utils ==0.2.1.0
- posix-paths ==0.2.1.6
- possibly ==1.0.0.0
- postgresql-binary ==0.12.1.2
- postgresql-libpq ==0.9.4.2
- postgresql-schema ==0.1.14
- postgresql-simple ==0.6.1
- postgresql-simple ==0.6.2
- postgresql-simple-migration ==0.1.14.0
- postgresql-simple-queue ==1.0.1
- postgresql-simple-url ==0.2.1.0
@@ -1650,6 +1650,7 @@ default-package-overrides:
- QuickCheck ==2.12.6.1
- quickcheck-arbitrary-adt ==0.3.1.0
- quickcheck-assertions ==0.3.0
- quickcheck-classes ==0.6.0.0
- quickcheck-instances ==0.3.19
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.0.4
@@ -1687,7 +1688,7 @@ default-package-overrides:
- rebase ==1.3.1
- record-dot-preprocessor ==0.1.5
- records-sop ==0.1.0.2
- recursion-schemes ==5.1.2
- recursion-schemes ==5.1.3
- reducers ==3.12.3
- refact ==0.3.0.2
- references ==0.3.3.1
@@ -1825,7 +1826,7 @@ default-package-overrides:
- servant-tracing ==0.1.0.2
- servant-websockets ==1.1.0
- servant-yaml ==0.1.0.1
- serverless-haskell ==0.8.6
- serverless-haskell ==0.8.7
- serversession ==1.0.1
- serversession-frontend-wai ==1.0
- servius ==1.2.3.0
@@ -1921,7 +1922,7 @@ default-package-overrides:
- storable-record ==0.0.4
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13
- store ==0.5.0.1
- store ==0.5.1.0
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.29.1
@@ -2052,13 +2053,13 @@ default-package-overrides:
- threads ==0.5.1.6
- threepenny-gui ==0.8.3.0
- th-reify-compat ==0.0.1.5
- th-reify-many ==0.1.8
- th-reify-many ==0.1.9
- throttle-io-stream ==0.2.0.1
- throwable-exceptions ==0.1.0.9
- th-strict-compat ==0.1.0.1
- th-utilities ==0.2.1.0
- thyme ==0.3.5.5
- tidal ==1.0.11
- tidal ==1.0.13
- tile ==0.3.0.0
- time-compat ==0.1.0.3
- timeit ==2.0
@@ -2066,7 +2067,7 @@ default-package-overrides:
- time-lens ==0.4.0.2
- time-locale-compat ==0.1.1.5
- time-locale-vietnamese ==1.0.0.0
- time-parsers ==0.1.2.0
- time-parsers ==0.1.2.1
- time-qq ==0.0.1.0
- timerep ==2.0.0.2
- timer-wheel ==0.1.0
@@ -2080,7 +2081,7 @@ default-package-overrides:
- tls-session-manager ==0.0.0.2
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==0.1.1.1
- tmp-postgres ==0.1.2.2
- token-bucket ==0.1.0.1
- tomland ==0.5.0
- tostring ==0.2.1.1
@@ -2180,7 +2181,7 @@ default-package-overrides:
- validity-vector ==0.2.0.2
- valor ==0.1.0.0
- vault ==0.3.1.2
- vec ==0.1
- vec ==0.1.1
- vector ==0.12.0.2
- vector-algorithms ==0.8.0.1
- vector-binary-instances ==0.2.5.1
@@ -2223,9 +2224,9 @@ default-package-overrides:
- wai-slack-middleware ==0.2.0
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- warp ==3.2.26
- warp-tls ==3.2.4.3
- warp-tls-uid ==0.2.0.5
- warp ==3.2.27
- warp-tls ==3.2.5
- warp-tls-uid ==0.2.0.6
- wave ==0.1.5
- wcwidth ==0.0.2
- web3 ==0.8.3.1
@@ -2309,7 +2310,7 @@ default-package-overrides:
- yesod ==1.6.0
- yesod-alerts ==0.1.2.0
- yesod-auth ==1.6.6
- yesod-auth-hashdb ==1.7.1
- yesod-auth-hashdb ==1.7.1.1
- yesod-auth-oauth2 ==0.6.1.1
- yesod-bin ==1.6.0.3
- yesod-core ==1.6.14
@@ -2322,8 +2323,8 @@ default-package-overrides:
- yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.1
- yesod-newsfeed ==1.6.1.0
- yesod-paginator ==1.1.0.1
- yesod-persistent ==1.6.0.1
- yesod-paginator ==1.1.0.2
- yesod-persistent ==1.6.0.2
- yesod-recaptcha2 ==0.3.0
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.0.1
@@ -2341,7 +2342,7 @@ default-package-overrides:
- zeromq4-patterns ==0.3.1.0
- zim-parser ==0.2.1.0
- zip ==1.2.0
- zip-archive ==0.4
- zip-archive ==0.4.1
- zippers ==0.2.5
- zip-stream ==0.2.0.1
- zlib ==0.6.2
@@ -2391,13 +2392,15 @@ extra-packages:
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
- network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30)
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
- patience ^>= 0.1 # required by chell-0.4.x
- persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227
- persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227
- primitive == 0.5.1.* # required to build alex with GHC 6.12.3
- proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
- QuickCheck < 2 # required by test-framework-quickcheck and its users
- resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227
- seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
@@ -2413,7 +2416,6 @@ extra-packages:
- yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227
- patience ^>= 0.1 # required by chell-0.4.x
package-maintainers:
peti:
@@ -2599,7 +2601,7 @@ dont-distribute-packages:
- XML
broken-packages:
# these packages don't compile
# These packages don't compile or depend on packages that don't compile.
- 3dmodels
- 4Blocks
- a50
@@ -3173,6 +3175,7 @@ broken-packages:
- blockhash
- Blogdown
- blogination
- BlogLiterately-diagrams
- bloodhound
- bloodhound-amazonka-auth
- bloomfilter-redis
@@ -3228,6 +3231,9 @@ broken-packages:
- brok
- broker-haskell
- bronyradiogermany-streaming
- brotli
- brotli-conduit
- brotli-streams
- browscap
- bson-generic
- bson-generics
@@ -3278,6 +3284,7 @@ broken-packages:
- c2hsc
- cabal-audit
- cabal-bundle-clib
- cabal-cache
- cabal-cargs
- cabal-constraints
- cabal-db
@@ -4020,9 +4027,11 @@ broken-packages:
- dia-base
- dia-functions
- diagrams-boolean
- diagrams-builder
- diagrams-canvas
- diagrams-graphviz
- diagrams-gtk
- diagrams-haddock
- diagrams-hsqml
- diagrams-html5
- diagrams-pandoc
@@ -4600,6 +4609,7 @@ broken-packages:
- frag
- Frames-beam
- Frames-dsv
- Frames-map-reduce
- franchise
- Frank
- freddy
@@ -4731,6 +4741,7 @@ broken-packages:
- generic-tree
- generic-xml
- generic-xmlpickler
- generics-eot
- genericserialize
- genesis
- genesis-test
@@ -5232,6 +5243,7 @@ broken-packages:
- haskell-src-exts-prisms
- haskell-src-exts-qq
- haskell-src-exts-sc
- haskell-src-exts-simple
- haskell-src-meta-mwotton
- haskell-stack-trace-plugin
- haskell-token-utils
@@ -5567,6 +5579,7 @@ broken-packages:
- HLearn-datastructures
- HLearn-distributions
- hledger-chart
- hledger-flow
- hledger-irr
- hledger-vty
- hlibBladeRF
@@ -5717,6 +5730,7 @@ broken-packages:
- HROOT-math
- HROOT-tree
- hs-blake2
- hs-brotli
- hs-carbon-examples
- hs-cdb
- hs-conllu
@@ -6056,6 +6070,7 @@ broken-packages:
- ihaskell-diagrams
- ihaskell-display
- ihaskell-gnuplot
- ihaskell-graphviz
- ihaskell-hatex
- ihaskell-hvega
- ihaskell-inline-r
@@ -6361,6 +6376,7 @@ broken-packages:
- kmp-dfa
- knead
- knead-arithmetic
- knit-haskell
- knots
- koellner-phonetic
- korfu
@@ -6527,6 +6543,7 @@ broken-packages:
- libconfig
- libcspm
- libexpect
- libffi-dynamic
- libGenI
- libhbb
- libinfluxdb
@@ -6767,6 +6784,7 @@ broken-packages:
- manifolds
- manifolds-core
- map-exts
- map-reduce-folds
- map-syntax
- Mapping
- mappy
@@ -7174,7 +7192,6 @@ broken-packages:
- netwire-vinylglfw-examples
- network-address
- network-anonymous-i2p
- network-bsd
- network-builder
- network-bytestring
- network-connection
@@ -7584,6 +7601,7 @@ broken-packages:
- pipes-async
- pipes-attoparsec-streaming
- pipes-bgzf
- pipes-brotli
- pipes-cacophony
- pipes-cereal
- pipes-cereal-plus
@@ -7661,6 +7679,7 @@ broken-packages:
- polh-lexicon
- polimorf
- Pollutocracy
- poly
- poly-control
- polydata
- polydata-core
@@ -7797,6 +7816,7 @@ broken-packages:
- proteome
- proto-lens-combinators
- proto-lens-descriptors
- proto3-suite
- protobuf-native
- protocol-buffers-descriptor-fork
- protocol-buffers-fork
@@ -7833,6 +7853,7 @@ broken-packages:
- purescript-iso
- purescript-tsd-gen
- push-notify
- push-notify-apn
- push-notify-ccs
- push-notify-general
- pusher-haskell
@@ -8295,6 +8316,7 @@ broken-packages:
- scenegraph
- schedevr
- schedule-planner
- scheduler
- schedyield
- schematic
- scholdoc
@@ -8865,10 +8887,12 @@ broken-packages:
- streamdeck
- streamed
- streaming-benchmarks
- streaming-brotli
- streaming-cassava
- streaming-concurrency
- streaming-conduit
- streaming-fft
- streaming-lzma
- streaming-osm
- streaming-pcap
- streaming-png
@@ -9029,6 +9053,7 @@ broken-packages:
- tasty-jenkins-xml
- tasty-laws
- tasty-lens
- tasty-quickcheck-laws
- tasty-stats
- tasty-tap
- tasty-travis
@@ -9209,6 +9234,7 @@ broken-packages:
- tkhs
- tkyprof
- tls-extra
- tmp-postgres
- tn
- to-haskell
- to-string-class
@@ -9417,6 +9443,7 @@ broken-packages:
- unity-testresult-parser
- unitym-yesod
- universe
- universe-dependent-sum
- universe-instances-extended
- universe-th
- universum
@@ -9528,6 +9555,7 @@ broken-packages:
- vector-bytestring
- vector-clock
- vector-conduit
- vector-endian
- vector-extras
- vector-functorlazy
- vector-heterogenous
File diff suppressed because it is too large Load Diff