From 45afdf5fa314228da0deb81a7e904fb150f62b5a Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Fri, 26 Jun 2015 13:37:41 -0600 Subject: [PATCH 1/6] add algebra package to Stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 55a6a6c8..01896faa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -257,6 +257,7 @@ packages: # - MFlow "Edward Kmett ": + - algebra - ad - adjunctions - approximate From 1fd7485e23ecaa76807cb0b1f8de56b04851e545 Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Tue, 30 Jun 2015 13:33:26 -0600 Subject: [PATCH 2/6] utility libraries, and ltext --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 557a795e..43840455 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -258,7 +258,6 @@ packages: # - MFlow "Edward Kmett ": - - algebra - ad - adjunctions - approximate @@ -1016,6 +1015,10 @@ packages: - markup - webpage - composition-extra + - digestive-foundation-lucid + - ltext + - pred-trie + - poly-arity "Fumiaki Kinoshita @fumieval": - control-bool From f590783a02bdc70112733f24eacc7083b37016c3 Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Tue, 30 Jun 2015 13:35:48 -0600 Subject: [PATCH 3/6] roll-back for algebra --- README.md | 9 ++ automated/build.sh | 4 +- build-constraints.yaml | 244 +++++++++++++++++++++++++++++++---------- debian-bootstrap.sh | 3 + 4 files changed, 199 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 5b15fd98..c2963d49 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,15 @@ project information. In addition, we have the following repositories: * [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) * [lts-haskell](https://github.com/fpco/lts-haskell) * [stackage-nightly](https://github.com/fpco/stackage-nightly) + +We strongly recommend using the Haskell tool stack for doing builds, which +includes built-in Stackage support: + +* [stack](https://github.com/commercialhaskell/stack) [![Build Status](https://travis-ci.org/commercialhaskell/stack.svg?branch=master)](https://travis-ci.org/commercialhaskell/stack) + +We also support some add-on tools to cabal-install to make its usage with +Stackage both easier and more secure: + * [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) * [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) * [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) diff --git a/automated/build.sh b/automated/build.sh index af54104a..da6a9b60 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -77,6 +77,6 @@ ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$A # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator check-target-available --target $TARGET" -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" +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" docker run $ARGS_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET -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" +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" diff --git a/build-constraints.yaml b/build-constraints.yaml index 01896faa..43840455 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -13,6 +13,7 @@ packages: - hebrew-time - keter - markdown + - mime-mail - mime-mail-ses - monadcryptorandom - network-conduit-tls @@ -98,6 +99,7 @@ packages: - random-source - shelly - smtLib + - stack < 9.9.9 - stackage # Temporary block while system-filepath issues worked out # - stackage-curator @@ -114,8 +116,7 @@ packages: - statistics-linreg - th-expand-syns - thyme - # https://github.com/kallisti-dev/hs-webdriver/issues/71 - # - webdriver + - webdriver - web-fpco - criterion - th-lift @@ -257,7 +258,6 @@ packages: # - MFlow "Edward Kmett ": - - algebra - ad - adjunctions - approximate @@ -266,7 +266,7 @@ packages: - bound - bytes - charset - - comonad + - comonad > 4.2.7 || < 4.2.7 - comonads-fd - comonad-transformers # https://github.com/ekmett/compensated/issues/5 @@ -353,13 +353,10 @@ packages: "Brent Yorgey ": - active - BlogLiterately - # - BlogLiterately-diagrams GHC 7.10 + - BlogLiterately-diagrams - diagrams - - # https://github.com/fpco/stackage/issues/443 - #- diagrams-builder - #- diagrams-haddock - + - diagrams-builder + - diagrams-haddock - diagrams-contrib - diagrams-core - diagrams-lib @@ -386,12 +383,25 @@ packages: "Paul Harper ": - yesod-auth-oauth2 - "Felipe Lessa ": + "Felipe Lessa @meteficha": + - country-codes - esqueleto - fb - fb-persistent + - mangopay + - nonce + - serversession + - serversession-backend-acid-state + - serversession-backend-persistent + - serversession-backend-redis + - serversession-frontend-snap + # + # - serversession-frontend-wai + - serversession-frontend-yesod + - thumbnail-plus - yesod-fb - yesod-auth-fb + - yesod-mangopay "Alexander Altman ": - base-unicode-symbols @@ -428,6 +438,9 @@ packages: - turtle - foldl + "Arash Rouhani ": + - yesod-text-markdown + "Chris Allen ": - bloodhound @@ -461,7 +474,7 @@ packages: "Janne Hellsten ": - sqlite-simple - "Michal J. Gajda": + "Michal J. Gajda ": - iterable - Octree - FenwickTree @@ -470,6 +483,7 @@ packages: - wordpass - json-autotype + - posix-realtime "Dominic Steinitz ": [] @@ -485,6 +499,7 @@ packages: - hse-cpp - immortal - regex-applicative + - lexer-applicative - smallcheck - tasty - tasty-golden @@ -495,6 +510,7 @@ packages: - timezone-olson - timezone-series - traverse-with-class + - tuples-homogenous-h98 "George Giorgidze ": - HCodecs @@ -529,7 +545,9 @@ packages: #- hopenpgp-tools GHC 7.10, via syb-with-class "Joey Hess ": - - git-annex + [] + # https://github.com/fpco/stackage/issues/638 + # - git-annex # https://github.com/fpco/stackage/issues/160 "Ketil Malde": @@ -585,10 +603,11 @@ packages: - io-manager "Dimitri Sabadie ": - ghc-syb-utils @@ -802,6 +821,7 @@ packages: - hexstring - network-attoparsec - network-anonymous-i2p + - network-anonymous-tor "Timothy Jones git@zmthy.io @zmthy": - http-media @@ -922,6 +942,8 @@ packages: "Noam Lewis @sinelaw": - xml-to-json - xml-to-json-fast + - base-orphans + - digits "Tim Baumann @timjb": - aeson-schema @@ -936,6 +958,9 @@ packages: "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz": - setlocale + "John Chee @chee1bot": + - cgi + "Taylor Fausak @tfausak": - flow @@ -948,7 +973,10 @@ packages: - linux-namespaces "Will Coster @fimad": + - prometheus-client + - prometheus-metrics-ghc - scalpel + - wai-middleware-prometheus "Smirnov Alexey @chemist": - snmp @@ -972,10 +1000,12 @@ packages: - tasty-hspec "Christiaan Baaij @christiaanb": + - ghc-tcplugins-extra - ghc-typelits-natnormalise - clash-prelude - clash-lib - clash-vhdl + - clash-verilog - clash-systemverilog - clash-ghc @@ -985,6 +1015,10 @@ packages: - markup - webpage - composition-extra + - digestive-foundation-lucid + - ltext + - pred-trie + - poly-arity "Fumiaki Kinoshita @fumieval": - control-bool @@ -1003,7 +1037,10 @@ packages: "Michael Thompson @michaelt": - pipes-text - + - lens-simple + - lens-family-core + - lens-family + "Justin Le @mstksg": - auto - tagged-binary @@ -1015,49 +1052,73 @@ packages: - flowdock - growler - engine-io-growler - # https://github.com/iand675/metrics/issues/2 - # - metrics + - metrics - pipes-wai - serf - uri-templater - librato - + + "Michael Xavier @MichaelXavier": + - angel + - uri-bytestring + - phash + - cron + + "Lars Kuhtz @larskuhtz": + - wai-cors + + "Sam Rijs ": + - ndjson-conduit + - attoparsec-trans + + "Anupam Jain ": + - wai-routes + "Daniel Patterson ": + - hspec-snap + + "Mathieu Boespflug @mboes": + - netwire + - th-lift + + "Alcides Viamontes ": + - second-transfer + + "Hirotomo Moriwaki @philopon": + - apiary + - apiary-logger + - apiary-persistent + - apiary-websockets + - apiary-cookie + - apiary-session + - apiary-clientsession + - apiary-authenticate + - apiary-eventsource + - apiary-mongoDB + - apiary-memcached + - types-compat + - web-routing + - bytestring-read + - memcached-binary + + "Kai Zhang @kaizhang": + - clustering + - matrices + + "Michel Boucey @MichelBoucey": + - IPv6Addr + - ip6addr + - cayley-client + + "koral koral@mailoo.org @k0ral": + - timerep + "Stackage upper bounds": - # https://github.com/fpco/stackage/issues/476 - - vector-space < 0.10 - - # https://github.com/fpco/stackage/issues/509 - - srcloc < 0.5 - - # https://github.com/fpco/stackage/issues/515 - - exception-transformers < 0.4 - - exception-mtl < 0.4 - - # https://github.com/fpco/stackage/issues/517 - - generic-deriving < 1.7 - # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 - # https://github.com/fpco/stackage/issues/549 - - tttool < 1.4 - # https://github.com/fpco/stackage/issues/572 - attoparsec < 0.13 - aeson < 0.8.1.0 - - jose-jwt < 0.6 - - # https://github.com/fpco/stackage/issues/577 - - MonadRandom < 0.4 - - # https://github.com/fpco/stackage/issues/579 - - wai-app-static < 3.1 - - yesod-static < 1.5 - - keter < 1.4 - - # https://github.com/fpco/stackage/issues/581 - - xml-conduit < 1.3 - - html-conduit < 1.2 # https://github.com/fpco/stackage/issues/588 - semigroupoids < 4.5 @@ -1070,15 +1131,26 @@ packages: - machines < 0.5 - free < 4.12 - # https://github.com/fpco/stackage/issues/591 - - th-orphans < 0.12 - # https://github.com/fpco/stackage/issues/602 - errors < 2 - # https://github.com/fpco/stackage/issues/607 - - pandoc < 1.14 - - highlighting-kate < 0.5.13 + # https://github.com/fpco/stackage/issues/615 + - syb < 0.5 + + # https://github.com/gtk2hs/gtk2hs/issues/109 + - gtk < 0.13.8 + + # https://github.com/fpco/stackage/issues/639 + - mainland-pretty < 0.3 + + # https://github.com/fpco/stackage/issues/646 + - clock < 0.5 + + # https://github.com/fpco/stackage/issues/653 + - base-orphans < 0.4 + + # https://github.com/fpco/stackage/issues/654 + - generic-deriving < 1.8 # Package flags are applied to individual packages, and override the values of # global-flags @@ -1190,6 +1262,24 @@ skipped-tests: - Cabal - MissingH + # Upper bound on src-log, see: https://github.com/fpco/stackage/issues/509 + - language-c-quote + + # https://github.com/fpco/stackage/issues/602 + - aws + + # https://github.com/fpco/stackage/issues/622 + - ad + - bound + - heaps + - hyphenation + - linear + - machines + - semigroupoids + + # https://github.com/kaizhang/clustering/issues/2 + - clustering + # Tests which we should build and run, but which are expected to fail. We # should not fail a build based on a test failure for one of these packages. expected-test-failures: @@ -1379,9 +1469,6 @@ expected-test-failures: # https://github.com/simonmar/alex/issues/62 GHC 7.10 - alex - # https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10 - - haskell-names - # https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10 - hyperloglog @@ -1413,8 +1500,36 @@ expected-test-failures: # https://github.com/kazu-yamamoto/dns/issues/29 - dns - # https://github.com/haskell-servant/servant/issues/98 - - servant-client + # No PhantomJS available + - wai-cors + + # Permissions failure when creating /home/stackage/.stack. We _should_ fix + # this in the build scripts here... + - stack + + # https://github.com/kazu-yamamoto/http2/issues/4 + - http2 + + # https://github.com/alcidesv/second-transfer/issues/1 + - second-transfer + + # https://github.com/prowdsponsor/mangopay/issues/30 + - mangopay + + # https://github.com/MichaelXavier/Angel/issues/43 + - angel + + # https://github.com/MichaelXavier/phash/issues/4 + - phash + + # Requires memcached on the server + - memcached-binary + + # Requires redis on the build machine + - serversession-backend-redis + + # Unstated dependency on HList-PP + - Rlang-QQ # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: @@ -1466,6 +1581,15 @@ skipped-benchmarks: - postgresql-binary - scientific + # Pulls in discount which depends on extra C libraries + - cmark + + # Old criterion + - acid-state + + # https://github.com/kaizhang/clustering/issues/2 + - clustering + skipped-profiling: # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10 - ghc-heap-view @@ -1494,3 +1618,5 @@ github-users: - mihaimaruseac elm-lang: - JoeyEremondi + prowdsponsor: + - meteficha diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index de24152e..54034881 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -54,6 +54,9 @@ apt-get install -y \ libgtk-3-dev \ libxml2-dev \ libgsasl7-dev \ + libphash0-dev \ + libopenal-dev \ + libhidapi-dev \ libzmq3-dev mkdir /tmp/nettle-build From 87fc30846307ee5a8ca81226a41c1bcfb86a507b Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Tue, 30 Jun 2015 13:38:21 -0600 Subject: [PATCH 4/6] algebra --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 43840455..9f3013bf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -258,6 +258,7 @@ packages: # - MFlow "Edward Kmett ": + - algebra - ad - adjunctions - approximate From ab368486af7211d7591a4ef2a22a2ee35e3a814e Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Tue, 30 Jun 2015 13:40:41 -0600 Subject: [PATCH 5/6] unneeded --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9f3013bf..43840455 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -258,7 +258,6 @@ packages: # - MFlow "Edward Kmett ": - - algebra - ad - adjunctions - approximate From ad861c57a8ef459a45ad2e6da6312b7f18099287 Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Tue, 30 Jun 2015 14:57:12 -0600 Subject: [PATCH 6/6] apologies, there was a typo. Version 0.0.0.3 of digestive-functors-lucid should work --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 43840455..90ba5c3a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1015,7 +1015,7 @@ packages: - markup - webpage - composition-extra - - digestive-foundation-lucid + - digestive-functors-lucid - ltext - pred-trie - poly-arity