on master help sign in
Merge branch 'master' of https://github.com/fpco/stackage
commita3b37d7205c328ac068c231d02a68bf368b32387 authorAthan Clark <athan.clark@gmail.com> dateTue 30 Jun 2015, 13:30 (11 years ago) parent45afdf5a3c7324
4 files changed+192−57
README.md+9 automated/build.sh+2−2 build-constraints.yaml+178−55 debian-bootstrap.sh+3
README.md+9
@@ -18,6 +18,15 @@ project information. In addition, we have the following repositories:
1818* [stackage-types](https://github.com/fpco/stackage-types) [![Build Status](https://travis-ci.org/fpco/stackage-types.svg?branch=master)](https://travis-ci.org/fpco/stackage-types)
1919* [lts-haskell](https://github.com/fpco/lts-haskell)
2020* [stackage-nightly](https://github.com/fpco/stackage-nightly)
21+
22+We strongly recommend using the Haskell tool stack for doing builds, which
23+includes built-in Stackage support:
24+
25+* [stack](https://github.com/commercialhaskell/stack) [![Build Status](https://travis-ci.org/commercialhaskell/stack.svg?branch=master)](https://travis-ci.org/commercialhaskell/stack)
26+
27+We also support some add-on tools to cabal-install to make its usage with
28+Stackage both easier and more secure:
29+
2130* [stackage-cli](https://github.com/fpco/stackage-cli) [![Build Status](https://travis-ci.org/fpco/stackage-cli.svg?branch=master)](https://travis-ci.org/fpco/stackage-cli)
2231* [stackage-update](https://github.com/fpco/stackage-update) [![Build Status](https://travis-ci.org/fpco/stackage-update.svg?branch=master)](https://travis-ci.org/fpco/stackage-update)
2332* [stackage-upload](https://github.com/fpco/stackage-upload) [![Build Status](https://travis-ci.org/fpco/stackage-upload.svg?branch=master)](https://travis-ci.org/fpco/stackage-upload)
automated/build.sh+2−2
@@ -77,6 +77,6 @@ ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$A
7777
7878# Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
7979docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator check-target-available --target $TARGET"
80−docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"
80+docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random Cabal cabal-install"
8181docker run $ARGS_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET
82−docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload --bundle-file $BUNDLE_FILE && stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --target $TARGET && stackage-curator upload-index --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-docs --target $TARGET --bundle-file $BUNDLE_FILE"
82+docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload-docs --target $TARGET --bundle-file $BUNDLE_FILE && stackage-curator upload-index --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --target $TARGET && stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET"
build-constraints.yaml+178−55
@@ -13,6 +13,7 @@ packages:
1313 - hebrew-time
1414 - keter
1515 - markdown
16+ - mime-mail
1617 - mime-mail-ses
1718 - monadcryptorandom
1819 - network-conduit-tls
@@ -98,6 +99,7 @@ packages:
9899 - random-source
99100 - shelly
100101 - smtLib
102+ - stack < 9.9.9
101103 - stackage
102104 # Temporary block while system-filepath issues worked out
103105 # - stackage-curator
@@ -114,8 +116,7 @@ packages:
114116 - statistics-linreg
115117 - th-expand-syns
116118 - thyme
117− # https://github.com/kallisti-dev/hs-webdriver/issues/71
118− # - webdriver
119+ - webdriver
119120 - web-fpco
120121 - criterion
121122 - th-lift
@@ -266,7 +267,7 @@ packages:
266267 - bound
267268 - bytes
268269 - charset
269− - comonad
270+ - comonad > 4.2.7 || < 4.2.7
270271 - comonads-fd
271272 - comonad-transformers
272273 # https://github.com/ekmett/compensated/issues/5
@@ -353,13 +354,10 @@ packages:
353354 "Brent Yorgey <byorgey@gmail.com>":
354355 - active
355356 - BlogLiterately
356− # - BlogLiterately-diagrams GHC 7.10
357+ - BlogLiterately-diagrams
357358 - diagrams
358−
359− # https://github.com/fpco/stackage/issues/443
360− #- diagrams-builder
361− #- diagrams-haddock
362−
359+ - diagrams-builder
360+ - diagrams-haddock
363361 - diagrams-contrib
364362 - diagrams-core
365363 - diagrams-lib
@@ -386,12 +384,25 @@ packages:
386384 "Paul Harper <benekastah@gmail.com>":
387385 - yesod-auth-oauth2
388386
389− "Felipe Lessa <felipe.lessa@gmail.com>":
387+ "Felipe Lessa <felipe.lessa@gmail.com> @meteficha":
388+ - country-codes
390389 - esqueleto
391390 - fb
392391 - fb-persistent
392+ - mangopay
393+ - nonce
394+ - serversession
395+ - serversession-backend-acid-state
396+ - serversession-backend-persistent
397+ - serversession-backend-redis
398+ - serversession-frontend-snap
399+ # <https://github.com/singpolyma/wai-session/pull/7>
400+ # - serversession-frontend-wai
401+ - serversession-frontend-yesod
402+ - thumbnail-plus
393403 - yesod-fb
394404 - yesod-auth-fb
405+ - yesod-mangopay
395406
396407 "Alexander Altman <alexanderaltman@me.com>":
397408 - base-unicode-symbols
@@ -428,6 +439,9 @@ packages:
428439 - turtle
429440 - foldl
430441
442+ "Arash Rouhani <miffoljud@gmail.com>":
443+ - yesod-text-markdown
444+
431445 "Chris Allen <cma@bitemyapp.com>":
432446 - bloodhound
433447
@@ -461,7 +475,7 @@ packages:
461475 "Janne Hellsten <jjhellst@gmail.com>":
462476 - sqlite-simple
463477
464− "Michal J. Gajda":
478+ "Michal J. Gajda <maintainer@migamake.com>":
465479 - iterable
466480 - Octree
467481 - FenwickTree
@@ -470,6 +484,7 @@ packages:
470484
471485 - wordpass
472486 - json-autotype
487+ - posix-realtime
473488
474489 "Dominic Steinitz <dominic@steinitz.org>":
475490 []
@@ -485,6 +500,7 @@ packages:
485500 - hse-cpp
486501 - immortal
487502 - regex-applicative
503+ - lexer-applicative
488504 - smallcheck
489505 - tasty
490506 - tasty-golden
@@ -495,6 +511,7 @@ packages:
495511 - timezone-olson
496512 - timezone-series
497513 - traverse-with-class
514+ - tuples-homogenous-h98
498515
499516 "George Giorgidze <giorgidze@gmail.com>":
500517 - HCodecs
@@ -529,7 +546,9 @@ packages:
529546 #- hopenpgp-tools GHC 7.10, via syb-with-class
530547
531548 "Joey Hess <id@joeyh.name>":
532− - git-annex
549+ []
550+ # https://github.com/fpco/stackage/issues/638
551+ # - git-annex
533552
534553 # https://github.com/fpco/stackage/issues/160
535554 "Ketil Malde":
@@ -585,10 +604,11 @@ packages:
585604 - io-manager
586605
587606 "Dimitri Sabadie <dimitri.sabadie@gmail.com":
588− # https://github.com/fpco/stackage/pull/461#issuecomment-76914158
589− # - al
607+ # - al --FIXME temporary, figure out why it's not working with stackage-build
590608 - monad-journal
591609 - smoothie
610+ - hid
611+ - msi-kb-backlit
592612
593613 "Thomas Schilling <nominolo@googlemail.com>":
594614 - ghc-syb-utils
@@ -802,6 +822,7 @@ packages:
802822 - hexstring
803823 - network-attoparsec
804824 - network-anonymous-i2p
825+ - network-anonymous-tor
805826
806827 "Timothy Jones git@zmthy.io @zmthy":
807828 - http-media
@@ -922,6 +943,8 @@ packages:
922943 "Noam Lewis <jones.noamle@gmail.com> @sinelaw":
923944 - xml-to-json
924945 - xml-to-json-fast
946+ - base-orphans
947+ - digits
925948
926949 "Tim Baumann <tim@timbaumann.info> @timjb":
927950 - aeson-schema
@@ -936,6 +959,9 @@ packages:
936959 "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
937960 - setlocale
938961
962+ "John Chee <cheecheeo+stackage@gmail.com> @chee1bot":
963+ - cgi
964+
939965 "Taylor Fausak <taylor@fausak.me> @tfausak":
940966 - flow
941967
@@ -948,7 +974,10 @@ packages:
948974 - linux-namespaces
949975
950976 "Will Coster <willcoster@gmail.com> @fimad":
977+ - prometheus-client
978+ - prometheus-metrics-ghc
951979 - scalpel
980+ - wai-middleware-prometheus
952981
953982 "Smirnov Alexey <chemistmail@gmail.com> @chemist":
954983 - snmp
@@ -972,10 +1001,12 @@ packages:
9721001 - tasty-hspec
9731002
9741003 "Christiaan Baaij <christiaan.baaij@gmail.com> @christiaanb":
1004+ - ghc-tcplugins-extra
9751005 - ghc-typelits-natnormalise
9761006 - clash-prelude
9771007 - clash-lib
9781008 - clash-vhdl
1009+ - clash-verilog
9791010 - clash-systemverilog
9801011 - clash-ghc
9811012
@@ -1003,7 +1034,10 @@ packages:
10031034
10041035 "Michael Thompson <what_is_it_to_do_anything@yahoo.com> @michaelt":
10051036 - pipes-text
1006−
1037+ - lens-simple
1038+ - lens-family-core
1039+ - lens-family
1040+
10071041 "Justin Le <justin@jle.im> @mstksg":
10081042 - auto
10091043 - tagged-binary
@@ -1015,49 +1049,73 @@ packages:
10151049 - flowdock
10161050 - growler
10171051 - engine-io-growler
1018− # https://github.com/iand675/metrics/issues/2
1019− # - metrics
1052+ - metrics
10201053 - pipes-wai
10211054 - serf
10221055 - uri-templater
10231056 - librato
1024−
1025− "Stackage upper bounds":
1026− # https://github.com/fpco/stackage/issues/476
1027− - vector-space < 0.10
10281057
1029− # https://github.com/fpco/stackage/issues/509
1030− - srcloc < 0.5
1058+ "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
1059+ - angel
1060+ - uri-bytestring
1061+ - phash
1062+ - cron
1063+
1064+ "Lars Kuhtz <lakuhtz@gmail.com> @larskuhtz":
1065+ - wai-cors
1066+
1067+ "Sam Rijs <srijs@airpost.net>":
1068+ - ndjson-conduit
1069+ - attoparsec-trans
10311070
1032− # https://github.com/fpco/stackage/issues/515
1033− - exception-transformers < 0.4
1034− - exception-mtl < 0.4
1071+ "Anupam Jain <ajnsit@gmail.com>":
1072+ - wai-routes
1073+ "Daniel Patterson <dbp@dbpmail.net>":
1074+ - hspec-snap
10351075
1036− # https://github.com/fpco/stackage/issues/517
1037− - generic-deriving < 1.7
1076+ "Mathieu Boespflug <mboes@tweag.net> @mboes":
1077+ - netwire
1078+ - th-lift
1079+
1080+ "Alcides Viamontes <a.viamontes.esquivel@gmail.com>":
1081+ - second-transfer
1082+
1083+ "Hirotomo Moriwaki <philopon.dependence@gmail.com> @philopon":
1084+ - apiary
1085+ - apiary-logger
1086+ - apiary-persistent
1087+ - apiary-websockets
1088+ - apiary-cookie
1089+ - apiary-session
1090+ - apiary-clientsession
1091+ - apiary-authenticate
1092+ - apiary-eventsource
1093+ - apiary-mongoDB
1094+ - apiary-memcached
1095+ - types-compat
1096+ - web-routing
1097+ - bytestring-read
1098+ - memcached-binary
1099+
1100+ "Kai Zhang <kai@kzhang.org> @kaizhang":
1101+ - clustering
1102+ - matrices
1103+
1104+ "Michel Boucey <michel.boucey@gmail.com> @MichelBoucey":
1105+ - IPv6Addr
1106+ - ip6addr
1107+ - cayley-client
1108+
1109+ "koral koral@mailoo.org @k0ral":
1110+ - timerep
10381111
1112+ "Stackage upper bounds":
10391113 # https://github.com/fpco/stackage/issues/537
10401114 - zlib < 0.6
10411115
1042− # https://github.com/fpco/stackage/issues/549
1043− - tttool < 1.4
1044−
10451116 # https://github.com/fpco/stackage/issues/572
10461117 - attoparsec < 0.13
10471118 - aeson < 0.8.1.0
1048− - jose-jwt < 0.6
1049−
1050− # https://github.com/fpco/stackage/issues/577
1051− - MonadRandom < 0.4
1052−
1053− # https://github.com/fpco/stackage/issues/579
1054− - wai-app-static < 3.1
1055− - yesod-static < 1.5
1056− - keter < 1.4
1057−
1058− # https://github.com/fpco/stackage/issues/581
1059− - xml-conduit < 1.3
1060− - html-conduit < 1.2
10611119
10621120 # https://github.com/fpco/stackage/issues/588
10631121 - semigroupoids < 4.5
@@ -1070,15 +1128,26 @@ packages:
10701128 - machines < 0.5
10711129 - free < 4.12
10721130
1073− # https://github.com/fpco/stackage/issues/591
1074− - th-orphans < 0.12
1075−
10761131 # https://github.com/fpco/stackage/issues/602
10771132 - errors < 2
10781133
1079− # https://github.com/fpco/stackage/issues/607
1080− - pandoc < 1.14
1081− - highlighting-kate < 0.5.13
1134+ # https://github.com/fpco/stackage/issues/615
1135+ - syb < 0.5
1136+
1137+ # https://github.com/gtk2hs/gtk2hs/issues/109
1138+ - gtk < 0.13.8
1139+
1140+ # https://github.com/fpco/stackage/issues/639
1141+ - mainland-pretty < 0.3
1142+
1143+ # https://github.com/fpco/stackage/issues/646
1144+ - clock < 0.5
1145+
1146+ # https://github.com/fpco/stackage/issues/653
1147+ - base-orphans < 0.4
1148+
1149+ # https://github.com/fpco/stackage/issues/654
1150+ - generic-deriving < 1.8
10821151
10831152# Package flags are applied to individual packages, and override the values of
10841153# global-flags
@@ -1190,6 +1259,24 @@ skipped-tests:
11901259 - Cabal
11911260 - MissingH
11921261
1262+ # Upper bound on src-log, see: https://github.com/fpco/stackage/issues/509
1263+ - language-c-quote
1264+
1265+ # https://github.com/fpco/stackage/issues/602
1266+ - aws
1267+
1268+ # https://github.com/fpco/stackage/issues/622
1269+ - ad
1270+ - bound
1271+ - heaps
1272+ - hyphenation
1273+ - linear
1274+ - machines
1275+ - semigroupoids
1276+
1277+ # https://github.com/kaizhang/clustering/issues/2
1278+ - clustering
1279+
11931280# Tests which we should build and run, but which are expected to fail. We
11941281# should not fail a build based on a test failure for one of these packages.
11951282expected-test-failures:
@@ -1379,9 +1466,6 @@ expected-test-failures:
13791466 # https://github.com/simonmar/alex/issues/62 GHC 7.10
13801467 - alex
13811468
1382− # https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10
1383− - haskell-names
1384−
13851469 # https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10
13861470 - hyperloglog
13871471
@@ -1413,8 +1497,36 @@ expected-test-failures:
14131497 # https://github.com/kazu-yamamoto/dns/issues/29
14141498 - dns
14151499
1416− # https://github.com/haskell-servant/servant/issues/98
1417− - servant-client
1500+ # No PhantomJS available
1501+ - wai-cors
1502+
1503+ # Permissions failure when creating /home/stackage/.stack. We _should_ fix
1504+ # this in the build scripts here...
1505+ - stack
1506+
1507+ # https://github.com/kazu-yamamoto/http2/issues/4
1508+ - http2
1509+
1510+ # https://github.com/alcidesv/second-transfer/issues/1
1511+ - second-transfer
1512+
1513+ # https://github.com/prowdsponsor/mangopay/issues/30
1514+ - mangopay
1515+
1516+ # https://github.com/MichaelXavier/Angel/issues/43
1517+ - angel
1518+
1519+ # https://github.com/MichaelXavier/phash/issues/4
1520+ - phash
1521+
1522+ # Requires memcached on the server
1523+ - memcached-binary
1524+
1525+ # Requires redis on the build machine
1526+ - serversession-backend-redis
1527+
1528+ # Unstated dependency on HList-PP
1529+ - Rlang-QQ
14181530
14191531# Haddocks which are expected to fail. Same concept as expected test failures.
14201532expected-haddock-failures:
@@ -1466,6 +1578,15 @@ skipped-benchmarks:
14661578 - postgresql-binary
14671579 - scientific
14681580
1581+ # Pulls in discount which depends on extra C libraries
1582+ - cmark
1583+
1584+ # Old criterion
1585+ - acid-state
1586+
1587+ # https://github.com/kaizhang/clustering/issues/2
1588+ - clustering
1589+
14691590skipped-profiling:
14701591 # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10
14711592 - ghc-heap-view
@@ -1494,3 +1615,5 @@ github-users:
14941615 - mihaimaruseac
14951616 elm-lang:
14961617 - JoeyEremondi
1618+ prowdsponsor:
1619+ - meteficha
debian-bootstrap.sh+3
@@ -54,6 +54,9 @@ apt-get install -y \
5454 libgtk-3-dev \
5555 libxml2-dev \
5656 libgsasl7-dev \
57+ libphash0-dev \
58+ libopenal-dev \
59+ libhidapi-dev \
5760 libzmq3-dev
5861
5962mkdir /tmp/nettle-build