on master help sign in
roll-back for algebra
commitf590783a02bdc70112733f24eacc7083b37016c3 authorAthan Clark <athan.clark@gmail.com> dateTue 30 Jun 2015, 13:35 (11 years ago) parent45afdf5
4 files changed+196−58
README.md+9 automated/build.sh+2−2 build-constraints.yaml+182−56 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+182−56
@@ -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
@@ -257,7 +258,6 @@ packages:
257258 # - MFlow
258259
259260 "Edward Kmett <ekmett@gmail.com>":
260− - algebra
261261 - ad
262262 - adjunctions
263263 - approximate
@@ -266,7 +266,7 @@ packages:
266266 - bound
267267 - bytes
268268 - charset
269− - comonad
269+ - comonad > 4.2.7 || < 4.2.7
270270 - comonads-fd
271271 - comonad-transformers
272272 # https://github.com/ekmett/compensated/issues/5
@@ -353,13 +353,10 @@ packages:
353353 "Brent Yorgey <byorgey@gmail.com>":
354354 - active
355355 - BlogLiterately
356− # - BlogLiterately-diagrams GHC 7.10
356+ - BlogLiterately-diagrams
357357 - diagrams
358−
359− # https://github.com/fpco/stackage/issues/443
360− #- diagrams-builder
361− #- diagrams-haddock
362−
358+ - diagrams-builder
359+ - diagrams-haddock
363360 - diagrams-contrib
364361 - diagrams-core
365362 - diagrams-lib
@@ -386,12 +383,25 @@ packages:
386383 "Paul Harper <benekastah@gmail.com>":
387384 - yesod-auth-oauth2
388385
389− "Felipe Lessa <felipe.lessa@gmail.com>":
386+ "Felipe Lessa <felipe.lessa@gmail.com> @meteficha":
387+ - country-codes
390388 - esqueleto
391389 - fb
392390 - fb-persistent
391+ - mangopay
392+ - nonce
393+ - serversession
394+ - serversession-backend-acid-state
395+ - serversession-backend-persistent
396+ - serversession-backend-redis
397+ - serversession-frontend-snap
398+ # <https://github.com/singpolyma/wai-session/pull/7>
399+ # - serversession-frontend-wai
400+ - serversession-frontend-yesod
401+ - thumbnail-plus
393402 - yesod-fb
394403 - yesod-auth-fb
404+ - yesod-mangopay
395405
396406 "Alexander Altman <alexanderaltman@me.com>":
397407 - base-unicode-symbols
@@ -428,6 +438,9 @@ packages:
428438 - turtle
429439 - foldl
430440
441+ "Arash Rouhani <miffoljud@gmail.com>":
442+ - yesod-text-markdown
443+
431444 "Chris Allen <cma@bitemyapp.com>":
432445 - bloodhound
433446
@@ -461,7 +474,7 @@ packages:
461474 "Janne Hellsten <jjhellst@gmail.com>":
462475 - sqlite-simple
463476
464− "Michal J. Gajda":
477+ "Michal J. Gajda <maintainer@migamake.com>":
465478 - iterable
466479 - Octree
467480 - FenwickTree
@@ -470,6 +483,7 @@ packages:
470483
471484 - wordpass
472485 - json-autotype
486+ - posix-realtime
473487
474488 "Dominic Steinitz <dominic@steinitz.org>":
475489 []
@@ -485,6 +499,7 @@ packages:
485499 - hse-cpp
486500 - immortal
487501 - regex-applicative
502+ - lexer-applicative
488503 - smallcheck
489504 - tasty
490505 - tasty-golden
@@ -495,6 +510,7 @@ packages:
495510 - timezone-olson
496511 - timezone-series
497512 - traverse-with-class
513+ - tuples-homogenous-h98
498514
499515 "George Giorgidze <giorgidze@gmail.com>":
500516 - HCodecs
@@ -529,7 +545,9 @@ packages:
529545 #- hopenpgp-tools GHC 7.10, via syb-with-class
530546
531547 "Joey Hess <id@joeyh.name>":
532− - git-annex
548+ []
549+ # https://github.com/fpco/stackage/issues/638
550+ # - git-annex
533551
534552 # https://github.com/fpco/stackage/issues/160
535553 "Ketil Malde":
@@ -585,10 +603,11 @@ packages:
585603 - io-manager
586604
587605 "Dimitri Sabadie <dimitri.sabadie@gmail.com":
588− # https://github.com/fpco/stackage/pull/461#issuecomment-76914158
589− # - al
606+ # - al --FIXME temporary, figure out why it's not working with stackage-build
590607 - monad-journal
591608 - smoothie
609+ - hid
610+ - msi-kb-backlit
592611
593612 "Thomas Schilling <nominolo@googlemail.com>":
594613 - ghc-syb-utils
@@ -802,6 +821,7 @@ packages:
802821 - hexstring
803822 - network-attoparsec
804823 - network-anonymous-i2p
824+ - network-anonymous-tor
805825
806826 "Timothy Jones git@zmthy.io @zmthy":
807827 - http-media
@@ -922,6 +942,8 @@ packages:
922942 "Noam Lewis <jones.noamle@gmail.com> @sinelaw":
923943 - xml-to-json
924944 - xml-to-json-fast
945+ - base-orphans
946+ - digits
925947
926948 "Tim Baumann <tim@timbaumann.info> @timjb":
927949 - aeson-schema
@@ -936,6 +958,9 @@ packages:
936958 "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz":
937959 - setlocale
938960
961+ "John Chee <cheecheeo+stackage@gmail.com> @chee1bot":
962+ - cgi
963+
939964 "Taylor Fausak <taylor@fausak.me> @tfausak":
940965 - flow
941966
@@ -948,7 +973,10 @@ packages:
948973 - linux-namespaces
949974
950975 "Will Coster <willcoster@gmail.com> @fimad":
976+ - prometheus-client
977+ - prometheus-metrics-ghc
951978 - scalpel
979+ - wai-middleware-prometheus
952980
953981 "Smirnov Alexey <chemistmail@gmail.com> @chemist":
954982 - snmp
@@ -972,10 +1000,12 @@ packages:
9721000 - tasty-hspec
9731001
9741002 "Christiaan Baaij <christiaan.baaij@gmail.com> @christiaanb":
1003+ - ghc-tcplugins-extra
9751004 - ghc-typelits-natnormalise
9761005 - clash-prelude
9771006 - clash-lib
9781007 - clash-vhdl
1008+ - clash-verilog
9791009 - clash-systemverilog
9801010 - clash-ghc
9811011
@@ -985,6 +1015,10 @@ packages:
9851015 - markup
9861016 - webpage
9871017 - composition-extra
1018+ - digestive-foundation-lucid
1019+ - ltext
1020+ - pred-trie
1021+ - poly-arity
9881022
9891023 "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":
9901024 - control-bool
@@ -1003,7 +1037,10 @@ packages:
10031037
10041038 "Michael Thompson <what_is_it_to_do_anything@yahoo.com> @michaelt":
10051039 - pipes-text
1006−
1040+ - lens-simple
1041+ - lens-family-core
1042+ - lens-family
1043+
10071044 "Justin Le <justin@jle.im> @mstksg":
10081045 - auto
10091046 - tagged-binary
@@ -1015,49 +1052,73 @@ packages:
10151052 - flowdock
10161053 - growler
10171054 - engine-io-growler
1018− # https://github.com/iand675/metrics/issues/2
1019− # - metrics
1055+ - metrics
10201056 - pipes-wai
10211057 - serf
10221058 - uri-templater
10231059 - librato
1024−
1025− "Stackage upper bounds":
1026− # https://github.com/fpco/stackage/issues/476
1027− - vector-space < 0.10
10281060
1029− # https://github.com/fpco/stackage/issues/509
1030− - srcloc < 0.5
1061+ "Michael Xavier <michael@michaelxavier.net> @MichaelXavier":
1062+ - angel
1063+ - uri-bytestring
1064+ - phash
1065+ - cron
1066+
1067+ "Lars Kuhtz <lakuhtz@gmail.com> @larskuhtz":
1068+ - wai-cors
1069+
1070+ "Sam Rijs <srijs@airpost.net>":
1071+ - ndjson-conduit
1072+ - attoparsec-trans
10311073
1032− # https://github.com/fpco/stackage/issues/515
1033− - exception-transformers < 0.4
1034− - exception-mtl < 0.4
1074+ "Anupam Jain <ajnsit@gmail.com>":
1075+ - wai-routes
1076+ "Daniel Patterson <dbp@dbpmail.net>":
1077+ - hspec-snap
10351078
1036− # https://github.com/fpco/stackage/issues/517
1037− - generic-deriving < 1.7
1079+ "Mathieu Boespflug <mboes@tweag.net> @mboes":
1080+ - netwire
1081+ - th-lift
1082+
1083+ "Alcides Viamontes <a.viamontes.esquivel@gmail.com>":
1084+ - second-transfer
1085+
1086+ "Hirotomo Moriwaki <philopon.dependence@gmail.com> @philopon":
1087+ - apiary
1088+ - apiary-logger
1089+ - apiary-persistent
1090+ - apiary-websockets
1091+ - apiary-cookie
1092+ - apiary-session
1093+ - apiary-clientsession
1094+ - apiary-authenticate
1095+ - apiary-eventsource
1096+ - apiary-mongoDB
1097+ - apiary-memcached
1098+ - types-compat
1099+ - web-routing
1100+ - bytestring-read
1101+ - memcached-binary
1102+
1103+ "Kai Zhang <kai@kzhang.org> @kaizhang":
1104+ - clustering
1105+ - matrices
1106+
1107+ "Michel Boucey <michel.boucey@gmail.com> @MichelBoucey":
1108+ - IPv6Addr
1109+ - ip6addr
1110+ - cayley-client
1111+
1112+ "koral koral@mailoo.org @k0ral":
1113+ - timerep
10381114
1115+ "Stackage upper bounds":
10391116 # https://github.com/fpco/stackage/issues/537
10401117 - zlib < 0.6
10411118
1042− # https://github.com/fpco/stackage/issues/549
1043− - tttool < 1.4
1044−
10451119 # https://github.com/fpco/stackage/issues/572
10461120 - attoparsec < 0.13
10471121 - 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
10611122
10621123 # https://github.com/fpco/stackage/issues/588
10631124 - semigroupoids < 4.5
@@ -1070,15 +1131,26 @@ packages:
10701131 - machines < 0.5
10711132 - free < 4.12
10721133
1073− # https://github.com/fpco/stackage/issues/591
1074− - th-orphans < 0.12
1075−
10761134 # https://github.com/fpco/stackage/issues/602
10771135 - errors < 2
10781136
1079− # https://github.com/fpco/stackage/issues/607
1080− - pandoc < 1.14
1081− - highlighting-kate < 0.5.13
1137+ # https://github.com/fpco/stackage/issues/615
1138+ - syb < 0.5
1139+
1140+ # https://github.com/gtk2hs/gtk2hs/issues/109
1141+ - gtk < 0.13.8
1142+
1143+ # https://github.com/fpco/stackage/issues/639
1144+ - mainland-pretty < 0.3
1145+
1146+ # https://github.com/fpco/stackage/issues/646
1147+ - clock < 0.5
1148+
1149+ # https://github.com/fpco/stackage/issues/653
1150+ - base-orphans < 0.4
1151+
1152+ # https://github.com/fpco/stackage/issues/654
1153+ - generic-deriving < 1.8
10821154
10831155# Package flags are applied to individual packages, and override the values of
10841156# global-flags
@@ -1190,6 +1262,24 @@ skipped-tests:
11901262 - Cabal
11911263 - MissingH
11921264
1265+ # Upper bound on src-log, see: https://github.com/fpco/stackage/issues/509
1266+ - language-c-quote
1267+
1268+ # https://github.com/fpco/stackage/issues/602
1269+ - aws
1270+
1271+ # https://github.com/fpco/stackage/issues/622
1272+ - ad
1273+ - bound
1274+ - heaps
1275+ - hyphenation
1276+ - linear
1277+ - machines
1278+ - semigroupoids
1279+
1280+ # https://github.com/kaizhang/clustering/issues/2
1281+ - clustering
1282+
11931283# Tests which we should build and run, but which are expected to fail. We
11941284# should not fail a build based on a test failure for one of these packages.
11951285expected-test-failures:
@@ -1379,9 +1469,6 @@ expected-test-failures:
13791469 # https://github.com/simonmar/alex/issues/62 GHC 7.10
13801470 - alex
13811471
1382− # https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10
1383− - haskell-names
1384−
13851472 # https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10
13861473 - hyperloglog
13871474
@@ -1413,8 +1500,36 @@ expected-test-failures:
14131500 # https://github.com/kazu-yamamoto/dns/issues/29
14141501 - dns
14151502
1416− # https://github.com/haskell-servant/servant/issues/98
1417− - servant-client
1503+ # No PhantomJS available
1504+ - wai-cors
1505+
1506+ # Permissions failure when creating /home/stackage/.stack. We _should_ fix
1507+ # this in the build scripts here...
1508+ - stack
1509+
1510+ # https://github.com/kazu-yamamoto/http2/issues/4
1511+ - http2
1512+
1513+ # https://github.com/alcidesv/second-transfer/issues/1
1514+ - second-transfer
1515+
1516+ # https://github.com/prowdsponsor/mangopay/issues/30
1517+ - mangopay
1518+
1519+ # https://github.com/MichaelXavier/Angel/issues/43
1520+ - angel
1521+
1522+ # https://github.com/MichaelXavier/phash/issues/4
1523+ - phash
1524+
1525+ # Requires memcached on the server
1526+ - memcached-binary
1527+
1528+ # Requires redis on the build machine
1529+ - serversession-backend-redis
1530+
1531+ # Unstated dependency on HList-PP
1532+ - Rlang-QQ
14181533
14191534# Haddocks which are expected to fail. Same concept as expected test failures.
14201535expected-haddock-failures:
@@ -1466,6 +1581,15 @@ skipped-benchmarks:
14661581 - postgresql-binary
14671582 - scientific
14681583
1584+ # Pulls in discount which depends on extra C libraries
1585+ - cmark
1586+
1587+ # Old criterion
1588+ - acid-state
1589+
1590+ # https://github.com/kaizhang/clustering/issues/2
1591+ - clustering
1592+
14691593skipped-profiling:
14701594 # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10
14711595 - ghc-heap-view
@@ -1494,3 +1618,5 @@ github-users:
14941618 - mihaimaruseac
14951619 elm-lang:
14961620 - JoeyEremondi
1621+ prowdsponsor:
1622+ - 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