on master help sign in
Merge branch 'master' into nightly
commita4e2933557f15aeff4c65ea06a5a941384b35433 authorJens Petersen <juhpetersen@gmail.com> dateWed 29 Mar 2017, 14:56 (10 years ago) parente9c5753b73d39c
2 files changed+64−16
build-constraints.yaml+59−16 debian-bootstrap.sh+5
build-constraints.yaml+59−16
@@ -2,6 +2,9 @@ ghc-major-version: "8.0"
22# Constraints for brand new builds
33packages:
44
5+ "Vanessa McHale <tmchale@wisc.edu> @vmchale":
6+ - tibetan-utils
7+
58 "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
69 - numeric-prelude
710 - non-negative
@@ -24,6 +27,7 @@ packages:
2427
2528 "Simon Jakobi <simon.jakobi@gmail.com> @sjakobi":
2629 - path
30+ - present
2731 - threepenny-gui
2832
2933 "Joe M <joe9mail@gmail.com> @joe9":
@@ -261,6 +265,7 @@ packages:
261265 - download
262266 - textlocal
263267 - shell-conduit
268+ - tldr
264269
265270 "haskell-openal":
266271 - OpenAL
@@ -416,7 +421,7 @@ packages:
416421 - zippers
417422 - fixed
418423 - half
419− # - gl BLOCKED directory 1.3
424+ - gl
420425 - lens-aeson
421426 - zlib-lens
422427 # - hyperloglog # bounds: approximate, binary, comonad
@@ -576,7 +581,6 @@ packages:
576581 - fay-text
577582 - fay-uri
578583 - feed
579− # - snaplet-fay # BLOCKED directory 1.3 via heist and snap
580584 - time-compat
581585 - through-text
582586
@@ -749,8 +753,8 @@ packages:
749753 - multipart
750754 - rest-client
751755 - rest-core
752− # - rest-gen # bounds: blaze-html
753− # - rest-happstack # via rest-gen: bounds: blaze-html
756+ - rest-gen
757+ - rest-happstack
754758 - rest-snap
755759 - rest-stringmap
756760 - rest-types
@@ -997,7 +1001,6 @@ packages:
9971001 "Jens Petersen <juhpetersen@gmail.com> @juhp":
9981002 - cabal-rpm
9991003 # - cabal-sort # BLOCKED directory 1.3
1000− - hslua
10011004 # - idris # bounds: safe
10021005 - xmonad-contrib
10031006 - shelly
@@ -1044,6 +1047,7 @@ packages:
10441047 # - mole # bounds: hspec, optparse-applicative
10451048 - publicsuffix
10461049 - rethinkdb-client-driver
1050+ - snap-blaze
10471051
10481052 "Alexandr Kurilin <alex@kurilin.net> @alex_kurilin":
10491053 - bcrypt
@@ -1092,6 +1096,7 @@ packages:
10921096 - getopt-generics
10931097 - graph-wrapper
10941098 - string-conversions
1099+ - hspec-checkers
10951100
10961101 "Jan Stolarek <jan.stolarek@p.lodz.pl> @jstolarek":
10971102 - tasty-program
@@ -1767,7 +1772,7 @@ packages:
17671772 - haskell-neo4j-client
17681773
17691774 "Anton Kholomiov <anton.kholomiov@gmail.com>":
1770− - data-fix
1775+ - data-fix
17711776
17721777 "Alexey Khudyakov <alexey.skladnoy@gmail.com> @Shimuuar":
17731778 - histogram-fill
@@ -2114,8 +2119,8 @@ packages:
21142119 "Takahiro Himura <himuratk421@gmail.com> @thimura":
21152120 - lens-regex
21162121 # - twitter-conduit # bounds: http-conduit 2.2 # via: twitter-types, twitter-types-lens
2117− # - twitter-types # via: derive
2118− # - twitter-types-lens # via: twitter-types
2122+ - twitter-types
2123+ - twitter-types-lens
21192124
21202125 # "Robbin C. <robbinch33@gmail.com> robbinch":
21212126 # - zim-parser # via: lzma
@@ -2441,6 +2446,7 @@ packages:
24412446 # - ghc-imported-from # bounds: process-streaming # via: ghc-mod
24422447
24432448 "Fraser Tweedale <frase@frase.id.au> @frasertweedale":
2449+ - concise
24442450 - jose
24452451
24462452 # "Yutaka Nishimura <ytk.nishimura@gmail.com> @ynishi":
@@ -2471,7 +2477,7 @@ packages:
24712477 "Stephen Diehl <stephen.m.diehl@gamil.com> @sdiehl":
24722478 - protolude
24732479 - repline
2474− # - picosat # https://github.com/sdiehl/haskell-picosat/issues/6
2480+ - picosat
24752481
24762482 # "Daishi Nakajima <nakaji.dayo@gmail.com> @nakaji_dayo":
24772483 # - yesod-job-queue # build failure https://github.com/nakaji-dayo/yesod-job-queue/issues/10
@@ -2633,12 +2639,15 @@ packages:
26332639
26342640 "Al Zohali <zohl@fmap.me> @zohl":
26352641 - servant-auth-cookie < 0.4.1 || > 0.4.1
2642+ - dictionaries
26362643
26372644 "Joachim Fasting <joachifm@fastmail.fm> @joachifm":
26382645 - libmpd
26392646
26402647 "Moritz Kiefer <moritz.kiefer@purelyfunctional.org> @cocreature":
26412648 - lrucaching
2649+ - llvm-hs
2650+ - llvm-hs-pure
26422651
26432652 "Thierry Bourrillon <thierry.bourrillon@fpinsight.com> @tbourrillon":
26442653 - hocilib
@@ -2820,8 +2829,7 @@ packages:
28202829 - sdl2-gfx
28212830
28222831 "Aditya Manthramurthy <aditya.mmy@gmail.com> @donatello":
2823− []
2824− # - minio-hs # https://github.com/fpco/stackage/pull/2377/files
2832+ - minio-hs
28252833
28262834 "ncaq <ncaq@ncaq.net> @ncaq":
28272835 - haskell-import-graph
@@ -2835,6 +2843,10 @@ packages:
28352843 "mackeyrms <librarymaintainer@mackeycorp.com> @mackeyrms":
28362844 - tsv2csv
28372845
2846+ "Thomas Sutton <me@thomas-sutton.id.au> @thsutton":
2847+ # - aeson-diff
2848+ - edit-distance-vector
2849+
28382850 "Kyle Van Berendonck <kvanberendonck@gmail.com> @kvanberendonck":
28392851 - rot13
28402852 - dvorak
@@ -2870,6 +2882,25 @@ packages:
28702882 - ziptastic-client
28712883 - ziptastic-core
28722884
2885+ "Hardy Jones <jones3.hardy@gmail.com> @joneshf":
2886+ - servant-ruby
2887+
2888+ "Andrey Mokhov <andrey.mokhov@gmail.com> @snowleopard":
2889+ - algebraic-graphs
2890+
2891+ "Albert Krewinkel <albert+stackage@zeitkraut.de> @tarleb":
2892+ - hslua
2893+ - hslua-aeson
2894+
2895+ "Judah Jacobson <judah.jacobson@gmail.com> @judah":
2896+ - lens-labels
2897+ - proto-lens
2898+ - proto-lens-descriptors
2899+ - proto-lens-protoc
2900+ - proto-lens-combinators
2901+ - proto-lens-arbitrary
2902+ - proto-lens-optparse
2903+
28732904 # If you stop maintaining a package you can move it here.
28742905 # It will then be disabled if it starts causing problems.
28752906 # See https://github.com/fpco/stackage/issues/1056
@@ -2936,6 +2967,15 @@ packages:
29362967 # https://github.com/fpco/stackage/issues/2378
29372968 - errors < 2.2.0
29382969
2970+ # https://github.com/fpco/stackage/issues/2386
2971+ - unordered-containers < 0.2.8.0
2972+
2973+ # https://github.com/fpco/stackage/issues/2393
2974+ - HUnit < 1.6.0.0
2975+
2976+ # https://github.com/fpco/stackage/issues/2400
2977+ - hslua < 0.5
2978+
29392979# end of packages
29402980
29412981# Package flags are applied to individual packages, and override the values of
@@ -3132,8 +3172,10 @@ skipped-tests:
31323172 - symengine # symengine
31333173
31343174
3135− # Wontfix. The maintainer chose to keep these broken/outdated, only
3136− # re-enable if requested.
3175+ # Wontfix. The maintainer doesn't want to keep test dependencies
3176+ # up to date or be notified about it, or doesn't want stackage to
3177+ # run the tests.
3178+ # Only re-enable if requested.
31373179 - postgresql-binary # https://github.com/nikita-volkov/postgresql-binary/issues/6#issuecomment-243063139
31383180
31393181 # directory 1.3
@@ -3265,7 +3307,6 @@ expected-test-failures:
32653307 - crypto-pubkey # https://github.com/vincenthz/hs-crypto-pubkey/issues/23
32663308 - cubicbezier # https://github.com/kuribas/cubicbezier/issues/3
32673309 - ghc-events # https://github.com/haskell/ghc-events/issues/9
3268− - ginger # https://bitbucket.org/tdammers/ginger/issues/1/test-suite-failure-due-to-missing-test
32693310 - graylog # 0.1.0.1 https://github.com/fpco/stackage/pull/1254
32703311 - haskell-names # 0.7.0 https://github.com/haskell-suite/haskell-names/issues/78
32713312 - rematch # No issue tracker, sent e-mail to maintainer https://github.com/fpco/stackage/issues/376
@@ -3292,6 +3333,7 @@ expected-test-failures:
32923333 - folds # https://github.com/ekmett/folds/issues/12
32933334 - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
32943335 - language-lua2 # https://github.com/mitchellwrosen/language-lua2/issues/4
3336+ - picosat # https://github.com/fpco/stackage/pull/2382
32953337 - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
32963338 - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1
32973339 - thyme # https://github.com/liyang/thyme/issues/50
@@ -3320,11 +3362,12 @@ expected-test-failures:
33203362 - makefile
33213363
33223364 # Misc.
3323− - aeson # 1.1.0.0 Will be fixed in the next release
33243365 - distributed-process-supervisor # # https://github.com/haskell-d
33253366 - ghcid # Weird conflicts with sandboxingistributed/distributed-process-supervisor/issues/1
33263367 - haskell-docs # GHC bug
3368+ - http-client-openssl # https://github.com/snoyberg/http-client/issues/267
33273369 - rattletrap # OOM? https://github.com/fpco/stackage/issues/2232
3370+ - req # https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
33283371 - servant # https://github.com/haskell-servant/servant/issues/698
33293372 - snap-core # https://github.com/snapframework/snap-core/issues/26
33303373 - stm-delay # https://github.com/joeyadams/haskell-stm-delay/issues/5
@@ -3723,8 +3766,8 @@ tell-me-when-its-released:
37233766- point-octree-0.5.5.3 # re-enable test and then we can resolve https://github.com/fpco/lts-haskell/issues/27
37243767- yarr-1.4.0.2 # Re-enable package https://github.com/fpco/stackage/issues/1876
37253768- terminal-progress-bar-0.1.1 # Unskip test suite
3769+- req-0.2.0 # Remove from expected-test-failures https://github.com/mrkkrp/req/issues/14#issuecomment-287562784
37263770- vivid-0.2.0.5 # Re-enable package (disabed per MonadRandom < 0.5) https://github.com/fpco/stackage/issues/2180
3727−- aeson-1.1.0.0 # Re-enable test suite
37283771
37293772# Packages which should be hidden after registering, to avoid module name
37303773# conflicts. This is intended for at least two use cases:
debian-bootstrap.sh+5
@@ -22,6 +22,9 @@ add-apt-repository ppa:hvr/ghc -y
2222add-apt-repository -y ppa:marutter/rrutter
2323# not sure what this was needed for
2424#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
25+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
26+echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
27+echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
2528
2629# Set the GHC version
2730GHCVER=8.0.2
@@ -113,11 +116,13 @@ apt-get install -y \
113116 libzmq3-dev \
114117 llvm-3.7 \
115118 locales \
119+ llvm-4.0-dev \
116120 m4 \
117121 nettle-dev \
118122 nodejs \
119123 npm \
120124 openjdk-8-jdk \
125+ protobuf-compiler \
121126 python-mpltoolkits.basemap \
122127 python3-matplotlib \
123128 python3-numpy \