on master help sign in
Merge branch 'master' into ghc7.10
63854caMichael Snoyman
Dockerfile+3−3
@@ -1,4 +1,4 @@
1−FROM ubuntu:12.04
1+FROM ubuntu:14.04
2
2
3ENV HOME /home/stackage
3ENV HOME /home/stackage
4ENV LANG en_US.UTF-8
4ENV LANG en_US.UTF-8
@@ -14,12 +14,12 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
14RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
14RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
15RUN rm /tmp/debian-bootstrap.sh
15RUN rm /tmp/debian-bootstrap.sh
16
16
17−RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 alex-3.1.3 happy-1.19.4
17+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 alex-3.1.3 happy-1.19.4 sudo
18
18
19ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
19ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4/bin:/opt/cabal/1.20/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
20
20
21RUN cabal update
21RUN cabal update
22−RUN cabal install hscolour cabal-install --constraint "Cabal < 1.22" && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
22+RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
23RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
23RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
24
24
25RUN cd /home/stackage && cabal update && stackage-curator check
25RUN cd /home/stackage && cabal update && stackage-curator check
build-constraints.yaml+109−37
@@ -19,7 +19,6 @@ packages:
19 - persistent-postgresql
19 - persistent-postgresql
20 - persistent-sqlite
20 - persistent-sqlite
21 - persistent-template
21 - persistent-template
22− - process-conduit
23 - random-shuffle
22 - random-shuffle
24 - sphinx
23 - sphinx
25 - stm-conduit
24 - stm-conduit
@@ -50,6 +49,7 @@ packages:
50 - lzma-conduit
49 - lzma-conduit
51 - mutable-containers
50 - mutable-containers
52 - hpc-coveralls
51 - hpc-coveralls
52+ - monad-unlift
53
53
54 "FP Complete michael@fpcomplete.com @snoyberg":
54 "FP Complete michael@fpcomplete.com @snoyberg":
55 - alex
55 - alex
@@ -121,6 +121,15 @@ packages:
121
121
122 - kure
122 - kure
123
123
124+ - ide-backend
125+ - ide-backend-server
126+ - ide-backend-rts
127+
128+ - hackage-mirror
129+ - wai-middleware-consul
130+ - monad-logger-json
131+ - monad-logger-syslog
132+
124 "Omari Norman <omari@smileystation.com>":
133 "Omari Norman <omari@smileystation.com>":
125 - rainbow
134 - rainbow
126 - multiarg
135 - multiarg
@@ -217,12 +226,11 @@ packages:
217 # requires old haddock currently - haskell-docs
226 # requires old haddock currently - haskell-docs
218 # TODO: Add structured-haskell-mode once they've been ported to HSE 1.16.
227 # TODO: Add structured-haskell-mode once they've been ported to HSE 1.16.
219
228
220− # GHC 7.6
221− # "Alberto G. Corona <agocorona@gmail.com>":
229+ "Alberto G. Corona <agocorona@gmail.com>":
222− # - RefSerialize
230+ - RefSerialize
223− # - TCache
231+ - TCache
224− # - Workflow
232+ - Workflow
225− # - MFlow
233+ - MFlow
226
234
227 "Edward Kmett <ekmett@gmail.com>":
235 "Edward Kmett <ekmett@gmail.com>":
228 - ad
236 - ad
@@ -291,9 +299,8 @@ packages:
291 - gl
299 - gl
292 - lens-aeson
300 - lens-aeson
293 - zlib-lens
301 - zlib-lens
294− # Temporary upper bound for some of the above packages
295− - generic-deriving < 1.7
302+ - generic-deriving
296− # hyperloglog
303+ - hyperloglog
297
304
298 "Andrew Farmer <afarmer@ittc.ku.edu>":
305 "Andrew Farmer <afarmer@ittc.ku.edu>":
299 - scotty
306 - scotty
@@ -313,6 +320,7 @@ packages:
313 - monad-coroutine
320 - monad-coroutine
314 - incremental-parser
321 - incremental-parser
315 - monoid-subclasses
322 - monoid-subclasses
323+ - picoparsec
316
324
317 "Brent Yorgey <byorgey@gmail.com>":
325 "Brent Yorgey <byorgey@gmail.com>":
318 - active
326 - active
@@ -380,12 +388,15 @@ packages:
380 - binary-list
388 - binary-list
381 - haskintex
389 - haskintex
382 - post-mess-age
390 - post-mess-age
391+ - include-file
383
392
384 "Gabriel Gonzalez <Gabriel439@gmail.com>":
393 "Gabriel Gonzalez <Gabriel439@gmail.com>":
385 - pipes
394 - pipes
386 - pipes-parse
395 - pipes-parse
387 - pipes-concurrency
396 - pipes-concurrency
388 - pipes-safe
397 - pipes-safe
398+ - turtle
399+ - foldl
389
400
390 "Chris Allen <cma@bitemyapp.com>":
401 "Chris Allen <cma@bitemyapp.com>":
391 - bloodhound
402 - bloodhound
@@ -434,11 +445,7 @@ packages:
434 - action-permutations
445 - action-permutations
435 - amqp
446 - amqp
436 - curl
447 - curl
437− - generics-sop
438−
439− # https://github.com/fpco/stackage/issues/341
440− - haskell-names < 0.5
448+ - haskell-names
441−
442 - haskell-packages
449 - haskell-packages
443 - heredoc
450 - heredoc
444 - hse-cpp
451 - hse-cpp
@@ -474,6 +481,8 @@ packages:
474 - ghc-heap-view
481 - ghc-heap-view
475 - tttool
482 - tttool
476 - gipeda
483 - gipeda
484+ - list-fusion-probe
485+ - haskell-spacegoo
477
486
478 "Aditya Bhargava <adit@adit.io":
487 "Aditya Bhargava <adit@adit.io":
479 - HandsomeSoup
488 - HandsomeSoup
@@ -532,6 +541,8 @@ packages:
532
541
533 "Simon Michael <simon@joyful.com>":
542 "Simon Michael <simon@joyful.com>":
534 - hledger
543 - hledger
544+ - shelltestrunner
545+ - hledger-web
535
546
536 "Mihai Maruseac <mihai.maruseac@gmail.com>":
547 "Mihai Maruseac <mihai.maruseac@gmail.com>":
537 - io-manager
548 - io-manager
@@ -684,7 +695,8 @@ packages:
684 - unbound-generics
695 - unbound-generics
685
696
686 "Alois Cochard alois.cochard@gmail.com @aloiscochard":
697 "Alois Cochard alois.cochard@gmail.com @aloiscochard":
698+ # https://github.com/fpco/stackage/issues/415
687− - codex
699+ # - codex
688 - machines-directory
700 - machines-directory
689 - machines-io
701 - machines-io
690 - machines-process
702 - machines-process
@@ -743,6 +755,8 @@ packages:
743 - string-conversions
755 - string-conversions
744
756
745 "Oleg Grenrus oleg.grenrus@iki.fi @phadej":
757 "Oleg Grenrus oleg.grenrus@iki.fi @phadej":
758+ - edit-distance
759+ - lattices
746 - waitra
760 - waitra
747
761
748 "Adam C. Foltzer acfoltzer@galois.com @acfoltzer":
762 "Adam C. Foltzer acfoltzer@galois.com @acfoltzer":
@@ -818,38 +832,75 @@ packages:
818 - cubicspline
832 - cubicspline
819 - maximal-cliques
833 - maximal-cliques
820
834
821− "Stackage upper bounds":
835+ "Alexander Bondarenko <aenor.realm@gmail.com> @wiz":
822−
836+ - soap
823− # https://github.com/fpco/stackage/issues/415
837+ - soap-tls
824− - hackage-db < 1.12
838+ - soap-openssl
825−
826− # https://github.com/fpco/stackage/issues/424
827− - control-monad-free < 0.6
828
839
829− # https://github.com/fpco/stackage/issues/442
840+ "Andres Löh <andres@well-typed.com> @kosmikus":
830− - blaze-builder < 0.4
841+ - generics-sop
831
842
832− # https://github.com/fpco/stackage/issues/487
843+ "Vivian McPhail <haskell.vivian.mcphail@gmail.com>":
833− - blaze-markup < 0.7
844+ - hmatrix-gsl-stats
834− - blaze-html < 0.8
845+ - hstatistics
846+ - hsignal
847+ - plot
848+ - plot-gtk
849+ - plot-gtk3
850+ - vector-buffer
851+ - hmatrix-repa
852+
853+ "Noam Lewis <jones.noamle@gmail.com> @sinelaw":
854+ - xml-to-json
855+ - xml-to-json-fast
856+
857+ "Tim Baumann <tim@timbaumann.info> @timjb":
858+ - aeson-schema
859+
860+ "David Fox <dsf@seereason.com> @ddssff":
861+ - debian
862+ - cabal-debian
863+
864+ "Stefan Saasen <stefan@saasen.me>":
865+ - jwt
866+
867+ "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
868+ - setlocale
835
869
870+ "Stackage upper bounds":
836 # https://github.com/fpco/stackage/issues/467
871 # https://github.com/fpco/stackage/issues/467
837 - lens < 4.8
872 - lens < 4.8
838
873
839 # https://github.com/fpco/stackage/issues/476
874 # https://github.com/fpco/stackage/issues/476
840 - vector-space < 0.10
875 - vector-space < 0.10
841
876
842− # https://github.com/ekmett/linear/issues/70
843− - linear < 1.18
844−
845 # https://github.com/fpco/stackage/issues/479
877 # https://github.com/fpco/stackage/issues/479
846 - QuickCheck < 2.8
878 - QuickCheck < 2.8
879+ - cabal-test-quickcheck < 0.1.5
847
880
848− # https://github.com/fpco/stackage/issues/483
881+ # https://github.com/jgm/pandoc/issues/2036
849− - rethinkdb-client-driver < 0.0.15
882+ - highlighting-kate < 0.5.13
850
883
851− # https://github.com/fpco/stackage/issues/494
884+ # https://github.com/fpco/stackage/issues/509
852− - criterion < 1.1
885+ - srcloc < 0.5
886+
887+ # https://github.com/fpco/stackage/issues/515
888+ - exception-transformers < 0.4
889+ - exception-mtl < 0.4
890+
891+ # https://github.com/fpco/stackage/issues/517
892+ - generic-deriving < 1.7
893+
894+ # https://github.com/fpco/stackage/issues/524
895+ - repa < 3.4
896+ - repa-algorithms < 3.4
897+ - repa-io < 3.4
898+
899+ # https://github.com/Happstack/happstack-server/issues/6
900+ - happstack-server < 7.4.3
901+
902+ # https://github.com/fpco/stackage/issues/531
903+ - sbv < 4.3
853
904
854# Package flags are applied to individual packages, and override the values of
905# Package flags are applied to individual packages, and override the values of
855# global-flags
906# global-flags
@@ -883,6 +934,7 @@ package-flags:
883
934
884 pandoc:
935 pandoc:
885 https: true
936 https: true
937+ old-locale: false
886
938
887 text:
939 text:
888 integer-simple: false
940 integer-simple: false
@@ -898,6 +950,12 @@ package-flags:
898 jose-jwt:
950 jose-jwt:
899 doctest: false
951 doctest: false
900
952
953+ time-locale-compat:
954+ old-locale: false
955+
956+ HsOpenSSL:
957+ fast-bignum: false
958+
901# By skipping a test suite, we do not pull in the build dependencies
959# By skipping a test suite, we do not pull in the build dependencies
902skipped-tests:
960skipped-tests:
903 - ReadArgs # old version of hspec
961 - ReadArgs # old version of hspec
@@ -1125,6 +1183,15 @@ expected-test-failures:
1125 # Requires locally running services
1183 # Requires locally running services
1126 - network-anonymous-i2p
1184 - network-anonymous-i2p
1127
1185
1186+ # Tests not reliable on non-Windows systems
1187+ - nsis
1188+
1189+ # Just a temporary package with a flimsy, inherited test suite
1190+ - Cabal-ide-backend
1191+
1192+ # Requires running server
1193+ - consul-haskell
1194+
1128# Haddocks which are expected to fail. Same concept as expected test failures.
1195# Haddocks which are expected to fail. Same concept as expected test failures.
1129expected-haddock-failures:
1196expected-haddock-failures:
1130 # https://github.com/acw/bytestring-progress/issues/4
1197 # https://github.com/acw/bytestring-progress/issues/4
@@ -1140,6 +1207,9 @@ expected-haddock-failures:
1140 # builds. Could consider special-casing this requirement.
1207 # builds. Could consider special-casing this requirement.
1141 - gtk
1208 - gtk
1142
1209
1210+ # Not sure why, but it's a temporary package anyway
1211+ - Cabal-ide-backend
1212+
1143# Benchmarks which should not be built. Note that Stackage does *not* generally
1213# Benchmarks which should not be built. Note that Stackage does *not* generally
1144# build benchmarks. The difference here will be whether dependencies for these
1214# build benchmarks. The difference here will be whether dependencies for these
1145# benchmarks are included or not.
1215# benchmarks are included or not.
@@ -1166,8 +1236,10 @@ skipped-benchmarks:
1166 # sometimes falls out-of-sync on hasql-postgres
1236 # sometimes falls out-of-sync on hasql-postgres
1167 - hasql
1237 - hasql
1168
1238
1169− # https://github.com/fpco/stackage/issues/488
1239+ # https://github.com/fpco/stackage/issues/494
1170− - uuid-types
1240+ - case-insensitive
1241+ - postgresql-binary
1242+ - scientific
1171
1243
1172skipped-profiling:
1244skipped-profiling:
1173 # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10
1245 # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10
debian-bootstrap.sh+2−3
@@ -10,9 +10,8 @@
10# instructions, see:
10# instructions, see:
11# http://www.stackage.org/install
11# http://www.stackage.org/install
12
12
13−add-apt-repository -y ppa:chris-lea/zeromq
14−add-apt-repository -y ppa:floe/libtisch
15add-apt-repository -y ppa:zoogie/sdl2-snapshots
13add-apt-repository -y ppa:zoogie/sdl2-snapshots
14+
16apt-get update
15apt-get update
17apt-get install -y \
16apt-get install -y \
18 build-essential \
17 build-essential \
@@ -21,7 +20,6 @@ apt-get install -y \
21 wget \
20 wget \
22 m4 \
21 m4 \
23 texlive-full \
22 texlive-full \
24− libgmp3c2 \
25 libgmp3-dev \
23 libgmp3-dev \
26 zlib1g-dev \
24 zlib1g-dev \
27 libedit2 \
25 libedit2 \
@@ -53,6 +51,7 @@ apt-get install -y \
53 liblzma-dev \
51 liblzma-dev \
54 libsdl2-dev \
52 libsdl2-dev \
55 libxss-dev \
53 libxss-dev \
54+ libgtk-3-dev \
56 libzmq3-dev
55 libzmq3-dev
57
56
58mkdir /tmp/nettle-build
57mkdir /tmp/nettle-build