From 46f95d8ddbf10babb8242bc81543f97d27a83e79 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 24 Dec 2014 12:13:36 +0200 Subject: [PATCH 001/287] GHC 7.10 testing changes DO NOT MERGE --- Stackage/PerformBuild.hs | 19 +++++++++++-------- build-constraints.yaml | 22 +++------------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/Stackage/PerformBuild.hs b/Stackage/PerformBuild.hs index c74b449a..b1682e4e 100644 --- a/Stackage/PerformBuild.hs +++ b/Stackage/PerformBuild.hs @@ -168,6 +168,7 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do $ \ClosedStream Inherited Inherited -> return () pbLog $ encodeUtf8 "Copying built-in Haddocks\n" copyBuiltInHaddocks (pbDocDir pb) + pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n" sem <- atomically $ newTSem pbJobs active <- newTVarIO (0 :: Int) @@ -288,7 +289,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} = log' t = do i <- readTVarIO sbActive errs <- readTVarIO sbErrsVar - pbLog $ encodeUtf8 $ concat + when False $ pbLog $ encodeUtf8 $ concat [ t , " (pending: " , tshow i @@ -367,7 +368,6 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} = args = "haddock" : "--hyperlink-source" : "--html" - : "--hoogle" : "--html-location=../$pkg-$version/" : hfsOpts @@ -416,12 +416,15 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} = warn t = atomically $ modifyTVar sbWarningsVar (. (t:)) updateErrs exc = do - log' $ concat - [ display (piName sbPackageInfo) - , ": " - , tshow exc - ] - atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc' + case exc' of + DependencyFailed _ -> return () + _ -> do + log' $ concat + [ display (piName sbPackageInfo) + , ": " + , tshow exc + ] + atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc' where exc' = case fromException exc of diff --git a/build-constraints.yaml b/build-constraints.yaml index c4de7765..74b60e4b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2,7 +2,7 @@ packages: "Michael Snoyman michael@snoyman.com @snoyberg": - bzlib-conduit - - cabal-install < 1.19 # GHC 7.10 bumpd to 1.22 + - cabal-install - cabal-src - case-insensitive - classy-prelude-yesod @@ -264,7 +264,7 @@ packages: - monad-products - monad-st - monad-st - - mtl < 2.2 # GHC 7.10 bump + - mtl - nats - numeric-extras - parsers @@ -596,7 +596,7 @@ packages: - hasql-backend - hasql-postgres - list-t - - mtl-prelude < 2 # GHC 7.10 bump + - mtl-prelude - neat-interpolation - partial-handler - postgresql-binary @@ -705,10 +705,6 @@ packages: "Stackage upper bounds": - # Force a specific version that's compatible with transformers 0.3 - - transformers-compat == 0.3.3.3 - - mtl-compat < 0.2 # https://github.com/fpco/stackage/issues/446 - # https://github.com/fpco/stackage/issues/291 - random < 1.0.1.3 @@ -769,24 +765,12 @@ package-flags: simplelocalnet: true p2p: true - # GHC 7.10: Remove this - # Note that the flag is lower-cased, because that's what Cabal does - # Perhaps the codebase should automatically lower case flag names? - storable-complex: - instanceinbase: false - logfloat: splitbase: true curl: new-base: true - # GHC 7.10 remove - aeson: - old-locale: true - tttool: - old-locale: true - hxt: network-uri: true hxt-http: From 5aecf6deb7e548e3b33b3c040c3e48fdbee19576 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 18 Mar 2015 15:37:00 +0200 Subject: [PATCH 002/287] Tweak mtl-compat constraints --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ce127ee5..75cfb730 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -831,7 +831,7 @@ package-flags: old-time: false mtl-compat: - two-point-one: true + two-point-one: false two-point-two: false # By skipping a test suite, we do not pull in the build dependencies From b9de1c28cd7cfe3a74bc3a9a70485903a99ac6ce Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 18 Mar 2015 15:47:25 +0200 Subject: [PATCH 003/287] Return code to match master branch --- Stackage/PerformBuild.hs | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Stackage/PerformBuild.hs b/Stackage/PerformBuild.hs index e64fbd07..06c1edc6 100644 --- a/Stackage/PerformBuild.hs +++ b/Stackage/PerformBuild.hs @@ -180,7 +180,6 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do $ \ClosedStream Inherited Inherited -> return () pbLog $ encodeUtf8 "Copying built-in Haddocks\n" copyBuiltInHaddocks (pbDocDir pb) - pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n" sem <- atomically $ newTSem pbJobs active <- newTVarIO (0 :: Int) @@ -314,7 +313,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} = log' t = do i <- readTVarIO sbActive errs <- readTVarIO sbErrsVar - when False $ pbLog $ encodeUtf8 $ concat + pbLog $ encodeUtf8 $ concat [ t , " (pending: " , tshow i @@ -486,15 +485,12 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} = warn t = atomically $ modifyTVar sbWarningsVar (. (t:)) updateErrs exc = do - case exc' of - DependencyFailed _ -> return () - _ -> do - log' $ concat - [ display (piName sbPackageInfo) - , ": " - , tshow exc - ] - atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc' + log' $ concat + [ display (piName sbPackageInfo) + , ": " + , tshow exc + ] + atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc' where exc' = case fromException exc of From 697c13727ffcd470ee539c3ad89031784f35def3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 22 Mar 2015 16:57:26 +0200 Subject: [PATCH 004/287] Update Travis for GHC 7.10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cf90696a..70421914 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ env: - - CABALVER=1.20 GHCVER=7.8.4 + - CABALVER=1.22 GHCVER=7.10.1 # Note: the distinction between `before_install` and `install` is not important. before_install: From 906f14e17627ddff466602cae20abafc6fda8306 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 2 Apr 2015 16:45:32 -0400 Subject: [PATCH 005/287] add git-annex @nomeata suggested I add it, and this is fine by me. git-annex is a leaf, non-library package, and in the http://hackage.haskell.org/packages/top list, after filtering out the core haskell ecosystem, git-annex is near the top of the list of remaining packages. For whatever that might be worth. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 65c05960..56f07335 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -490,6 +490,9 @@ packages: - MusicBrainz - DAV - hopenpgp-tools + + "Joey Hess ": + - git-annex # https://github.com/fpco/stackage/issues/160 "Ketil Malde": From 18500d3685e1a8e7e3d2731894c0de7ebea66173 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 8 Apr 2015 08:22:13 +0300 Subject: [PATCH 006/287] old-locale for hledger --- build-constraints.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 399ad4a1..58652bfc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -979,6 +979,13 @@ package-flags: cabal-debian: pretty-112: false + hledger: + old-locale: true + hledger-lib: + old-locale: true + hledger-web: + old-locale: true + # By skipping a test suite, we do not pull in the build dependencies skipped-tests: - ReadArgs # old version of hspec From 4daee956eeb1428a98957d5fcac55ef823a79af7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 8 Apr 2015 09:36:28 +0300 Subject: [PATCH 007/287] Expected test failure jaspervdj/hakyll#345 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 58652bfc..40bd4411 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1222,6 +1222,9 @@ expected-test-failures: # Requires running server - consul-haskell + # https://github.com/jaspervdj/hakyll/issues/345 + - hakyll + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 2b715658ab6409300ad5573f4d90b1dfcc939bf1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 8 Apr 2015 17:08:35 +0300 Subject: [PATCH 008/287] Don't expect test failure jaspervdj/hakyll#345 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 40bd4411..58652bfc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1222,9 +1222,6 @@ expected-test-failures: # Requires running server - consul-haskell - # https://github.com/jaspervdj/hakyll/issues/345 - - hakyll - # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From ac7a7c7a842e1616d1cfd40a9554ca26dfc41b2b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 8 Apr 2015 17:16:50 +0300 Subject: [PATCH 009/287] Docker: install newest cabal-install Otherwise, old Cabal and Cabal-ide-backend (based on newer Cabal) seem to get completely confused about custom package databases... yay broken software! --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca916c3e..ca33effa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8 ENV 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 RUN cabal update -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 +RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage RUN 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 RUN cd /home/stackage && cabal update && stackage-curator check From a752fbe75b59b0d60cd9c1a7fa4483d2522ee129 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 12 Apr 2015 12:11:58 +0300 Subject: [PATCH 010/287] Remove upper bounds and close #529 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 58652bfc..3ea76982 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -907,9 +907,6 @@ packages: # https://github.com/Happstack/happstack-server/issues/6 - happstack-server < 7.4.3 - # https://github.com/fpco/stackage/issues/529 - - fixed-vector < 0.8 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 54eba2076ec76038619e90860858ea8c72aed42b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 12 Apr 2015 12:12:54 +0300 Subject: [PATCH 011/287] Upper bound for #531 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3ea76982..18077cf1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -907,6 +907,9 @@ packages: # https://github.com/Happstack/happstack-server/issues/6 - happstack-server < 7.4.3 + # https://github.com/fpco/stackage/issues/531 + - sbv < 4.3 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 406c9bc02a057b81b532001fef8cbe7b27774608 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 12 Apr 2015 12:59:04 +0300 Subject: [PATCH 012/287] Remove lens upper bound --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97a48751..78fba28b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -868,9 +868,6 @@ packages: - setlocale "Stackage upper bounds": - # https://github.com/fpco/stackage/issues/467 - - lens < 4.8 - # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From 576ed0d892cd76fb7c241efea977c3142b30cf82 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 13 Apr 2015 09:05:49 +0300 Subject: [PATCH 013/287] Avoid some broken versions --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 18077cf1..5f013bcc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -910,6 +910,12 @@ packages: # https://github.com/fpco/stackage/issues/531 - sbv < 4.3 + # https://github.com/chrisdone/pdfinfo/issues/11 + - pdfinfo < 1.5.3 || > 1.5.3 + + # https://github.com/RaphaelJ/repa-devil/issues/7 + - repa-devil == 0.3.2.2 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 49f40b4c46b6e6fb4f4fcefe94afa6ac6bcca3f2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 13 Apr 2015 13:45:31 +0300 Subject: [PATCH 014/287] Remove repa-devil constraint --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5f013bcc..5ab2b627 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -913,9 +913,6 @@ packages: # https://github.com/chrisdone/pdfinfo/issues/11 - pdfinfo < 1.5.3 || > 1.5.3 - # https://github.com/RaphaelJ/repa-devil/issues/7 - - repa-devil == 0.3.2.2 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 5535e761379fa3806da83d3647d29fb6e19a5363 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 13 Apr 2015 13:48:35 +0300 Subject: [PATCH 015/287] Remove pdfinfo bounds chrisdone/pdfinfo#11 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5ab2b627..18077cf1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -910,9 +910,6 @@ packages: # https://github.com/fpco/stackage/issues/531 - sbv < 4.3 - # https://github.com/chrisdone/pdfinfo/issues/11 - - pdfinfo < 1.5.3 || > 1.5.3 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 205237cea78d320c9beb13fe2a2380e7d3721564 Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Mon, 13 Apr 2015 18:48:18 +0700 Subject: [PATCH 016/287] Adds bitcoin-script and bitcoin-tx --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 18077cf1..6fec7981 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -737,6 +737,8 @@ packages: - sdl2 "Leon Mergen leon@solatis.com @solatis": + - bitcoin-script + - bitcoin-tx - network-attoparsec - network-anonymous-i2p From 093485f26d8903c3d7746a6b86d8c2aed2852fe5 Mon Sep 17 00:00:00 2001 From: Taylor Fausak Date: Tue, 14 Apr 2015 09:03:31 -0500 Subject: [PATCH 017/287] Add flow --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6fec7981..82bd73d5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -869,6 +869,9 @@ packages: "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz": - setlocale + "Taylor Fausak @tfausak": + - flow + "Stackage upper bounds": # GHC 7.8 uppdate bound - haddock-api < 2.16 From a791e9f6ad84c9352afe3e23db49f8ff4e85ad49 Mon Sep 17 00:00:00 2001 From: "Adam C. Foltzer" Date: Tue, 14 Apr 2015 14:06:37 -0700 Subject: [PATCH 018/287] add persistent-refs --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 82bd73d5..e52165c0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -764,6 +764,7 @@ packages: "Adam C. Foltzer acfoltzer@galois.com @acfoltzer": - cryptol - gitrev + - persistent-refs "Luke Taylor tekul.hs@gmail.com @tekul": - jose-jwt From abc01983fb9c9461bee418d674513b21bf763612 Mon Sep 17 00:00:00 2001 From: Brendan Hay Date: Wed, 15 Apr 2015 15:12:01 +0200 Subject: [PATCH 019/287] Adding Amazon Machine Learning SDK --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e52165c0..939ed8a1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -801,6 +801,7 @@ packages: - amazonka-kinesis - amazonka-kms - amazonka-lambda + - amazonka-ml - amazonka-opsworks - amazonka-rds - amazonka-redshift From 2f9053a2562f8ab099eb076c8efeb407ff5e0269 Mon Sep 17 00:00:00 2001 From: Brendan Hay Date: Wed, 15 Apr 2015 16:17:29 +0200 Subject: [PATCH 020/287] Adding Amazon WorkSpaces SDK --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 939ed8a1..acbb0ef5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -817,6 +817,7 @@ packages: - amazonka-sts - amazonka-support - amazonka-swf + - amazonka-workspaces - ede - pagerduty - semver From a98ce596b9e6dd21fb14415e7dfbfc78d88a8876 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 16 Apr 2015 19:23:01 +0300 Subject: [PATCH 021/287] Upper bound for #537 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index acbb0ef5..6ff2710a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -918,6 +918,9 @@ packages: # https://github.com/fpco/stackage/issues/531 - sbv < 4.3 + # https://github.com/fpco/stackage/issues/537 + - zlib < 0.6 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From c863a3230973b6e34f62ab13955414e2cf5dcea8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 17 Apr 2015 06:35:06 +0300 Subject: [PATCH 022/287] Add stackage-update --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6ff2710a..b0cc3b54 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -95,6 +95,7 @@ packages: - stackage - stackage-curator - stackage-types + - stackage-update - statistics-linreg - th-expand-syns - thyme From e702d53329313669ee5055526f9e034a6a5e5175 Mon Sep 17 00:00:00 2001 From: Marios Titas Date: Fri, 17 Apr 2015 16:07:40 +0100 Subject: [PATCH 023/287] add github/redneb packages --- build-constraints.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b0cc3b54..a0947af3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -876,6 +876,14 @@ packages: "Taylor Fausak @tfausak": - flow + "Marios Titas @redneb": + - btrfs + - disk-free-space + - hxt-css + - islink + - linux-file-extents + - linux-namespaces + "Stackage upper bounds": # GHC 7.8 uppdate bound - haddock-api < 2.16 From 6411755ebffaea32ae86f42c2756d0f5e3d7d053 Mon Sep 17 00:00:00 2001 From: Will Coster Date: Sun, 19 Apr 2015 16:49:17 -0700 Subject: [PATCH 024/287] Add scalpel to stackage --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a0947af3..a06bedb6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -883,6 +883,9 @@ packages: - islink - linux-file-extents - linux-namespaces + + "Will Coster @fimad": + - scalpel "Stackage upper bounds": # GHC 7.8 uppdate bound From c30a504b2e894f47bb2de24632e4d4e9164a1f4c Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Mon, 20 Apr 2015 10:05:06 +0700 Subject: [PATCH 025/287] Adds hexstring package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a0947af3..5bfac0bb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -740,6 +740,7 @@ packages: "Leon Mergen leon@solatis.com @solatis": - bitcoin-script - bitcoin-tx + - hexstring - network-attoparsec - network-anonymous-i2p From b5179dbb9e11beaddd41779bf2f20b22a5c8d523 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 20 Apr 2015 07:26:35 +0300 Subject: [PATCH 026/287] Temporarily block Chart-diagrams #541 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b0cc3b54..bdbe7f9f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -60,7 +60,8 @@ packages: - cairo - cassava - Chart - - Chart-diagrams + # https://github.com/fpco/stackage/issues/541 + # - Chart-diagrams - compdata - configurator - convertible From 6f629d3809f4719593deadb89621cfa9b195c402 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 20 Apr 2015 10:39:46 +0300 Subject: [PATCH 027/287] Add stackage-cli --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e38aa71c..785351b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -97,6 +97,7 @@ packages: - stackage-curator - stackage-types - stackage-update + - stackage-cli - statistics-linreg - th-expand-syns - thyme From 781078b12650bd97095dce3c7351280ee4957997 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 20 Apr 2015 10:48:04 +0300 Subject: [PATCH 028/287] Add subdirectory with stackage package --- stackage/ChangeLog.md | 5 +++++ stackage/LICENSE | 20 ++++++++++++++++++++ stackage/README.md | 2 ++ stackage/Setup.hs | 2 ++ stackage/Stackage/Dummy.hs | 3 +++ stackage/stackage.cabal | 23 +++++++++++++++++++++++ 6 files changed, 55 insertions(+) create mode 100644 stackage/ChangeLog.md create mode 100644 stackage/LICENSE create mode 100644 stackage/README.md create mode 100644 stackage/Setup.hs create mode 100644 stackage/Stackage/Dummy.hs create mode 100644 stackage/stackage.cabal diff --git a/stackage/ChangeLog.md b/stackage/ChangeLog.md new file mode 100644 index 00000000..51676ad3 --- /dev/null +++ b/stackage/ChangeLog.md @@ -0,0 +1,5 @@ +## 0.7.0.0 + +* First release of this incarnation of the stackage package. Previously, this + package provided completely different functionality. That functionality has + since moved to stackage-curator. diff --git a/stackage/LICENSE b/stackage/LICENSE new file mode 100644 index 00000000..b08099d7 --- /dev/null +++ b/stackage/LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2015 FP Complete + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/stackage/README.md b/stackage/README.md new file mode 100644 index 00000000..941a7319 --- /dev/null +++ b/stackage/README.md @@ -0,0 +1,2 @@ +This is a dummy wrapper package, forcing installation of other packages which +provide real functionality. diff --git a/stackage/Setup.hs b/stackage/Setup.hs new file mode 100644 index 00000000..9a994af6 --- /dev/null +++ b/stackage/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/stackage/Stackage/Dummy.hs b/stackage/Stackage/Dummy.hs new file mode 100644 index 00000000..e82e4a47 --- /dev/null +++ b/stackage/Stackage/Dummy.hs @@ -0,0 +1,3 @@ +-- | This module does absolutely nothing. It's present so that cabal can more +-- easily track whether the stackage package is installed. +module Stackage.Dummy () where diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal new file mode 100644 index 00000000..7c002014 --- /dev/null +++ b/stackage/stackage.cabal @@ -0,0 +1,23 @@ +name: stackage +version: 0.7.0.0 +synopsis: Dummy package forcing installation of other Stackage packages +homepage: https://www.stackage.org/ +license: MIT +license-file: LICENSE +author: Michael Snoyman +maintainer: michael@snoyman.com +category: Development +build-type: Simple +extra-source-files: README.md ChangeLog.md +cabal-version: >=1.10 + +library + exposed-modules: Stackage.Dummy + build-depends: base < 10 + , stackage-cli + , stackage-update + default-language: Haskell2010 + +source-repository head + type: git + location: git://github.com/fpco/stackage.git From 2fb2c6fa37400672a1e4506fd7bc57838b3baaed Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 21 Apr 2015 15:00:18 +0300 Subject: [PATCH 029/287] Install htmldocs in Docker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca33effa..7fa1033b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh RUN rm /tmp/debian-bootstrap.sh -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 +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 ghc-7.8.4-htmldocs alex-3.1.3 happy-1.19.4 sudo ENV 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 From 020e3e7313d8ddf4a72a82fe848cc55c08a5d8ab Mon Sep 17 00:00:00 2001 From: Alexey Smirnov Date: Tue, 21 Apr 2015 15:16:27 +0300 Subject: [PATCH 030/287] Add snmp and agentx --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 785351b4..b3e6e439 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -889,6 +889,10 @@ packages: "Will Coster @fimad": - scalpel + + "Smirnov Alexey @chemist": + - snmp + - agentx "Stackage upper bounds": # GHC 7.8 uppdate bound From 5ad4e99deeb8403117c7f8850e72cac3ad7bcc0a Mon Sep 17 00:00:00 2001 From: David Christiansen Date: Tue, 21 Apr 2015 16:33:09 +0200 Subject: [PATCH 031/287] Add annotated-wl-pprint Hopefully the syntax is correct this time :-) --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b3e6e439..97f8c1b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -893,6 +893,9 @@ packages: "Smirnov Alexey @chemist": - snmp - agentx + + "David Raymond Christiansen @david-christiansen": + - annotated-wl-pprint "Stackage upper bounds": # GHC 7.8 uppdate bound From 92c853d1fbd2c4e7c090bba7ee6a91b9a53a58f2 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 22 Apr 2015 08:02:12 +0300 Subject: [PATCH 032/287] Docker: install git --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7fa1033b..8326f435 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN mkdir /home/stackage -p RUN locale-gen en_US.UTF-8 RUN DEBIAN_FRONTEND=noninteractive apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common python-software-properties +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common python-software-properties git RUN DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:hvr/ghc -y ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh From d65e54a7773ed170c779f488e0151e5841a0ee3b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 22 Apr 2015 12:20:28 +0300 Subject: [PATCH 033/287] Add WIP nightly.sh script --- automated/nightly.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 automated/nightly.sh diff --git a/automated/nightly.sh b/automated/nightly.sh new file mode 100755 index 00000000..d0406c4d --- /dev/null +++ b/automated/nightly.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# Work in progress + +set -e +set -x + +TARGET=nightly +WORKDIR=nightly +PLAN_FILE=current-plan.yaml +BUNDLE_FILE=current.bundle + +cd /home/ubuntu + +mkdir -p cabal ghc $WORKDIR .stackage-curator +rm -f stackage-curator stackage-curator.bz2 +wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 +bunzip2 stackage-curator.bz2 +chmod +x stackage-curator + +cat >gitconfig < Date: Wed, 22 Apr 2015 17:40:32 +0300 Subject: [PATCH 034/287] New build.sh --- automated/.gitignore | 10 ++++++ automated/build.sh | 73 ++++++++++++++++++++++++++++++++++++++++++++ automated/nightly.sh | 34 --------------------- 3 files changed, 83 insertions(+), 34 deletions(-) create mode 100644 automated/.gitignore create mode 100755 automated/build.sh delete mode 100755 automated/nightly.sh diff --git a/automated/.gitignore b/automated/.gitignore new file mode 100644 index 00000000..8285928f --- /dev/null +++ b/automated/.gitignore @@ -0,0 +1,10 @@ +/auth-token +/bin/ +/gitconfig +/hackage-creds +/ssh-nightly/ +/ssh-lts/ +/nighlty/ +/lts-*/ +/stackage-curator/ +/stackage-update/ diff --git a/automated/build.sh b/automated/build.sh new file mode 100755 index 00000000..3d92d45d --- /dev/null +++ b/automated/build.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash + +set -eux + +ROOT=$(cd $(dirname $0) ; pwd) +TARGET=$1 +TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1) +PLAN_FILE=current-plan.yaml +BUNDLE_FILE=current.bundle + +CABAL_DIR=$ROOT/cabal +GHC_DIR=$ROOT/ghc +CURATOR_DIR=$ROOT/stackage-curator +UPDATE_DIR=$ROOT/stackage-update +WORKDIR=$TROOT/work +SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1) + +mkdir -p \ + "$CABAL_DIR" \ + "$GHC_DIR" \ + "$CURATOR_DIR" \ + "$UPDATE_DIR" \ + "$WORKDIR" \ + "$SSH_DIR" + +GITCONFIG=$ROOT/gitconfig +cat >$GITCONFIG <$SSH_DIR/known_hosts <gitconfig < Date: Wed, 22 Apr 2015 17:55:59 +0300 Subject: [PATCH 035/287] Upper bound for simonmichael/hledger#245 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 97f8c1b4..881679f5 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -943,6 +943,9 @@ packages: # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 + # https://github.com/simonmichael/hledger/issues/245 + - base-compat < 0.8 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 819e0d388899e11c1b5c2d71626821931d9013fc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 25 Apr 2015 21:00:10 +0300 Subject: [PATCH 036/287] Temporarily block Chart, allow newer lens --- build-constraints.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 881679f5..68e1ea4b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -59,7 +59,10 @@ packages: - c2hs - cairo - cassava - - Chart + + # https://github.com/fpco/stackage/issues/467 + # - Chart + # https://github.com/fpco/stackage/issues/541 # - Chart-diagrams - compdata @@ -906,9 +909,6 @@ packages: # Force a specific version that's compatible with transformers 0.3 - transformers-compat == 0.4.0.3 - # https://github.com/fpco/stackage/issues/467 - - lens < 4.8 - # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From 725dbdeb63aea6ff79101e1021667ae16139de33 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 26 Apr 2015 08:37:02 +0300 Subject: [PATCH 037/287] Remove upper bounds and close #467 --- build-constraints.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 68e1ea4b..878c6d72 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -59,9 +59,7 @@ packages: - c2hs - cairo - cassava - - # https://github.com/fpco/stackage/issues/467 - # - Chart + - Chart # https://github.com/fpco/stackage/issues/541 # - Chart-diagrams From 6c3e6ece90bbf3202ca971c811c3898635d3ea64 Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Sun, 26 Apr 2015 17:35:46 +0700 Subject: [PATCH 038/287] Adds base58string --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 878c6d72..414a75fa 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -741,6 +741,7 @@ packages: - sdl2 "Leon Mergen leon@solatis.com @solatis": + - base58string - bitcoin-script - bitcoin-tx - hexstring From a9f8db27e42718fbb1a5c324f846e3af9dc9bc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Mon, 27 Apr 2015 11:20:04 +0800 Subject: [PATCH 039/287] add getopt-generics --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 414a75fa..aa71dc3b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -760,6 +760,7 @@ packages: - language-c-quote "Sönke Hahn soenkehahn@gmail.com @soenkehahn": + - getopt-generics - string-conversions "Oleg Grenrus oleg.grenrus@iki.fi @phadej": From a8a59af5a4bba3de5cdf8bbe110a8fd661d06815 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 27 Apr 2015 11:15:38 +0300 Subject: [PATCH 040/287] Skip tests due to #479 --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 414a75fa..7ddc641e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -912,6 +912,7 @@ packages: - vector-space < 0.10 # https://github.com/fpco/stackage/issues/479 + # Remove skipped tests below as well - QuickCheck < 2.8 - cabal-test-quickcheck < 0.1.5 @@ -1070,6 +1071,10 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry + # https://github.com/fpco/stackage/issues/479 + - prednote + - rainbow + # 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: From c36fdd4adc153a7d40e72dd89f1313565eb70582 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 27 Apr 2015 12:13:23 +0300 Subject: [PATCH 041/287] Add stackage-upload --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7ddc641e..e323c3f0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -98,6 +98,7 @@ packages: - stackage-curator - stackage-types - stackage-update + - stackage-upload - stackage-cli - statistics-linreg - th-expand-syns From 4711185bfabaa8553e3ae91c0b3d76b5c8e4da3b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 28 Apr 2015 06:28:43 +0300 Subject: [PATCH 042/287] Remove some #479 skipped tests --- build-constraints.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e323c3f0..78bb987b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -913,7 +913,6 @@ packages: - vector-space < 0.10 # https://github.com/fpco/stackage/issues/479 - # Remove skipped tests below as well - QuickCheck < 2.8 - cabal-test-quickcheck < 0.1.5 @@ -1072,10 +1071,6 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry - # https://github.com/fpco/stackage/issues/479 - - prednote - - rainbow - # 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: From d4030fb548080697856c42f8e0bcb39ced0f679e Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 27 Apr 2015 21:46:28 -0700 Subject: [PATCH 043/287] + Dan Burton: yesod-gitrev --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 78bb987b..a9a56f99 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -378,6 +378,7 @@ packages: - accelerate "Dan Burton ": + - yesod-gitrev - basic-prelude - composition - io-memoize From 2edf57c3351edbcb5bc396bb3cbcc980640ca50d Mon Sep 17 00:00:00 2001 From: Toralf Wittner Date: Tue, 28 Apr 2015 11:02:54 +0200 Subject: [PATCH 044/287] Update build-constraints.yaml --- build-constraints.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a9a56f99..522696c3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -574,6 +574,15 @@ packages: - yesod-auth-hashdb "Toralf Wittner ": + - bytestring-conversion + - cql + - cql-io + - redis-resp + - redis-io + - swagger + - tinylog + - wai-predicates + - wai-routing - zeromq4-haskell "trupill@gmail.com": From 83239fd16451aa38826a58d23ceb7141e7f4dd08 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 08:46:01 +0300 Subject: [PATCH 045/287] Expected test failures --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 522696c3..e09b536b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1267,6 +1267,8 @@ expected-test-failures: # Requires running server - consul-haskell + - hedis + - redis-io # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: From 2e0e4c05ee7f455f84c47f393f796f153d63bbdc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 10:48:56 +0300 Subject: [PATCH 046/287] Expect test failure twittner/swagger#3 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e09b536b..959a0b15 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1270,6 +1270,9 @@ expected-test-failures: - hedis - redis-io + # https://github.com/twittner/swagger/issues/3 + - swagger + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From ee33f8ba92f2e3f917367d8c3d343907a28d7e8c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 11:55:15 +0300 Subject: [PATCH 047/287] Add stackage-install --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 959a0b15..986ada50 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -100,6 +100,7 @@ packages: - stackage-update - stackage-upload - stackage-cli + - stackage-install - statistics-linreg - th-expand-syns - thyme From 2a3c8f9b1fc9761d32994c6a825709aa4b931b35 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 11:55:59 +0300 Subject: [PATCH 048/287] stackage package: include -upload and -install --- stackage/stackage.cabal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal index 7c002014..ca16cdd8 100644 --- a/stackage/stackage.cabal +++ b/stackage/stackage.cabal @@ -1,5 +1,5 @@ name: stackage -version: 0.7.0.0 +version: 0.7.1.0 synopsis: Dummy package forcing installation of other Stackage packages homepage: https://www.stackage.org/ license: MIT @@ -16,6 +16,8 @@ library build-depends: base < 10 , stackage-cli , stackage-update + , stackage-upload + , stackage-install default-language: Haskell2010 source-repository head From b9116f11efd089594174f1f3491eb27600c874d5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 12:21:16 +0300 Subject: [PATCH 049/287] Add additional stackage project links --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f7048506..135b2f07 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ project information. In addition, we have the following repositories: * [stackage-curator](https://github.com/fpco/stackage-curator) [![Build Status](https://travis-ci.org/fpco/stackage-curator.svg?branch=master)](https://travis-ci.org/fpco/stackage-curator) * [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-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) +* [stackage-install](https://github.com/fpco/stackage-install) [![Build Status](https://travis-ci.org/fpco/stackage-install.svg?branch=master)](https://travis-ci.org/fpco/stackage-install) Get your package included ------------------------- From 0d0908d977ea892c64cc3e633526cb3f392bb07d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 12:22:04 +0300 Subject: [PATCH 050/287] stackage-nightly repo link --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 135b2f07..2cc5a0c4 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ project information. In addition, we have the following repositories: * [stackage-curator](https://github.com/fpco/stackage-curator) [![Build Status](https://travis-ci.org/fpco/stackage-curator.svg?branch=master)](https://travis-ci.org/fpco/stackage-curator) * [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) * [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) From 72236ccada7e13d711447c42b05bb98ca7f39f9b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 17:28:18 +0300 Subject: [PATCH 051/287] Remove upper bound for simonmichael/hledger#245 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 986ada50..20cda6ad 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -954,9 +954,6 @@ packages: # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 - # https://github.com/simonmichael/hledger/issues/245 - - base-compat < 0.8 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 3dcbf9e7cc8bec09deef9949d5684582d9126738 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 18:02:44 +0300 Subject: [PATCH 052/287] Revert "Remove upper bound for simonmichael/hledger#245" This reverts commit 72236ccada7e13d711447c42b05bb98ca7f39f9b. --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 20cda6ad..986ada50 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -954,6 +954,9 @@ packages: # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 + # https://github.com/simonmichael/hledger/issues/245 + - base-compat < 0.8 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From e9652caf71f93b25a427677c042403a11e98e335 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 29 Apr 2015 19:24:02 +0300 Subject: [PATCH 053/287] Revert "Revert "Remove upper bound for simonmichael/hledger#245"" This reverts commit 3dcbf9e7cc8bec09deef9949d5684582d9126738. --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 986ada50..20cda6ad 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -954,9 +954,6 @@ packages: # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 - # https://github.com/simonmichael/hledger/issues/245 - - base-compat < 0.8 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From bb3396d54599a25c09a2980ae5dbab3c76bf421d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 06:16:06 +0300 Subject: [PATCH 054/287] Upper bound for #549 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 20cda6ad..8fd5cda6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -954,6 +954,9 @@ packages: # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 + # https://github.com/fpco/stackage/issues/549 + - tttool < 1.4 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From c67909b37a10dad2b687a426e9984db28b428808 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 06:55:42 +0300 Subject: [PATCH 055/287] Block packages without GHC 7.10 support #378 --- build-constraints.yaml | 100 +++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 44 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 14b9bca5..60c0e36f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -112,18 +112,19 @@ packages: - th-desugar - quickcheck-assertions - - distributed-process-simplelocalnet + # Cloud Haskell not yet updated to GHC 7.10 + #- distributed-process-simplelocalnet # cloud-haskell - - rank1dynamic - - distributed-static + #- rank1dynamic + #- distributed-static - network-transport - - distributed-process - - distributed-process-extras - - distributed-process-async - - distributed-process-client-server - - distributed-process-supervisor - - distributed-process-task - - distributed-process-execution + #- distributed-process + #- distributed-process-extras + #- distributed-process-async + #- distributed-process-client-server + #- distributed-process-supervisor + #- distributed-process-task + #- distributed-process-execution - kure @@ -188,7 +189,6 @@ packages: "Vincent Hanquez": - bytedump - - certificate - cipher-aes - cipher-rc4 - connection @@ -221,9 +221,10 @@ packages: - lucid - osdkeys - pdfinfo - - present + #- present GHC 7.10, via atto-lisp - pure-io - - scrobble + # https://github.com/jgoerzen/testpack/issues/11 + #- scrobble GHC 7.10, for QuickCheck 2.8 via testpack - shell-conduit - sourcemap - hindent @@ -250,7 +251,8 @@ packages: - comonad - comonads-fd - comonad-transformers - - compensated + # https://github.com/ekmett/compensated/issues/5 + #- compensated GHC 7.10 - compressed - concurrent-supply - constraints @@ -271,7 +273,7 @@ packages: - lca - lens - linear - - linear-accelerate + #- linear-accelerate GHC 7.10 - log-domain - machines - monadic-arrays @@ -376,7 +378,8 @@ packages: - containers-unicode-symbols "Trevor L. McDonell ": - - accelerate + [] + # - accelerate GHC 7.10 "Dan Burton ": - yesod-gitrev @@ -446,14 +449,16 @@ packages: - json-autotype "Dominic Steinitz ": - - yarr + [] + # - yarr GHC 7.10 "Roman Cheplyaka ": - action-permutations - amqp - curl - - haskell-names - - haskell-packages + # GHC 7.10 https://github.com/haskell-suite/haskell-packages/issues/22 + #- haskell-names + #- haskell-packages - heredoc - hse-cpp - immortal @@ -465,8 +470,9 @@ packages: - tasty-quickcheck - tasty-smallcheck - time-lens - - timezone-olson - - timezone-series + # GHC 7.10 + #- timezone-olson + #- timezone-series - traverse-with-class "George Giorgidze ": @@ -485,21 +491,22 @@ packages: "Joachim Breitner ": - circle-packing - arbtt - - ghc-heap-view + # - ghc-heap-view GHC 7.10 - tttool - gipeda - list-fusion-probe - haskell-spacegoo "Aditya Bhargava ": - - hOpenPGP + #- hOpenPGP GHC 7.10, via syb-with-class - openpgp-asciiarmor - MusicBrainz - DAV - - hopenpgp-tools + #- hopenpgp-tools GHC 7.10, via syb-with-class # https://github.com/fpco/stackage/issues/160 "Ketil Malde": @@ -617,7 +624,8 @@ packages: - interpolatedstring-perl6 - iproute - missing-foreign - - MissingH + # https://github.com/jgoerzen/testpack/issues/11 + #- MissingH GHC 7.10, for QuickCheck 2.8 via testpack - multimap - parallel-io - text-binary @@ -636,7 +644,7 @@ packages: - hasql-postgres - list-t - mtl-prelude - - neat-interpolation + #- neat-interpolation GHC 7.10 - partial-handler - postgresql-binary - slave-thread @@ -693,8 +701,10 @@ packages: - type-list "David Turner ": - - alarmclock - - bank-holidays-england + [] + # GHC 7.10 + #- alarmclock + #- bank-holidays-england "Haskell Servant jkarni@gmail.com @jkarni": - servant @@ -713,7 +723,7 @@ packages: "Alois Cochard alois.cochard@gmail.com @aloiscochard": # https://github.com/fpco/stackage/issues/415 # - codex - - machines-directory + #- machines-directory GHC 7.10 - machines-io - machines-process # on behalf of Bryan O'Sullivan @bos @@ -745,7 +755,7 @@ packages: "Jeffrey Rosenbluth jeffrey.rosenbluth@gmail.com": - palette - - diagrams-canvas + #- diagrams-canvas GHC 7.10, via blank-canvas - diagrams-rasterific - lucid-svg @@ -775,7 +785,7 @@ packages: - string-conversions "Oleg Grenrus oleg.grenrus@iki.fi @phadej": - - edit-distance + #- edit-distance GHC 7.10 - lattices - waitra @@ -915,10 +925,6 @@ packages: # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 - # https://github.com/fpco/stackage/issues/479 - - QuickCheck < 2.8 - - cabal-test-quickcheck < 0.1.5 - # https://github.com/jgm/pandoc/issues/2036 - highlighting-kate < 0.5.13 @@ -932,11 +938,6 @@ packages: # https://github.com/fpco/stackage/issues/517 - generic-deriving < 1.7 - # https://github.com/fpco/stackage/issues/524 - - repa < 3.4 - - repa-algorithms < 3.4 - - repa-io < 3.4 - # https://github.com/Happstack/happstack-server/issues/6 - happstack-server < 7.4.3 @@ -1052,6 +1053,20 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry + # Just a temporary package with a flimsy, inherited test suite + - Cabal-ide-backend + + # QuickCheck 2.8 + - ChasingBottoms + - bson + - cabal-install + - exceptions + - graphviz + - pandoc + - testpack + - vector + - unordered-containers + # 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: @@ -1233,9 +1248,6 @@ expected-test-failures: # Tests not reliable on non-Windows systems - nsis - # Just a temporary package with a flimsy, inherited test suite - - Cabal-ide-backend - # Requires running server - consul-haskell - hedis From 43cd26629cf4b5556c5527f90b1cbe1081d31598 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 07:16:05 +0300 Subject: [PATCH 056/287] Block some more packages for GHC 7.10 compilation failures --- build-constraints.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 60c0e36f..dd2fbace 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -72,7 +72,8 @@ packages: - executable-hash - executable-path - fgl - - fixed-list + # https://github.com/jvranish/FixedList/issues/1 + #- fixed-list GHC 7.10 - foreign-store - formatting #- fpco-api @@ -738,7 +739,9 @@ packages: - HaskellNet "Jens Petersen juhpetersen@gmail.com @juhp": - - cabal-rpm + [] + # https://github.com/juhp/cabal-rpm/issues/18 + # - cabal-rpm # GHC 7.10 "Renzo Carbonara renzocarbonara@gmail.com @k0001": - network-simple @@ -866,9 +869,11 @@ packages: - maximal-cliques "Alexander Bondarenko @wiz": - - soap - - soap-tls - - soap-openssl + [] + # GHC 7.10, via iconv + #- soap + #- soap-tls + #- soap-openssl "Andres Löh @kosmikus": - generics-sop From 5488c156103ad613bc8449adee24f6071968e4d7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 07:20:19 +0300 Subject: [PATCH 057/287] Add back HandsomeSoup --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dd2fbace..e4b0fee6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -499,8 +499,7 @@ packages: - haskell-spacegoo "Aditya Bhargava ": #- hOpenPGP GHC 7.10, via syb-with-class From 99c482895b93ec909a33974c27f2f4a134b7f969 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 07:40:29 +0300 Subject: [PATCH 058/287] Two more GHC 7.10 compilation failures --- build-constraints.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e4b0fee6..54b8d9a7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -201,7 +201,8 @@ packages: - crypto-random-api - hit - language-java - - libgit + # https://github.com/vincenthz/hs-libgit/issues/4 + # - libgit GHC 7.10 - pem - siphash - socks @@ -671,7 +672,8 @@ packages: #- elm-compiler - elm-core-sources #- elm-package - - language-glsl + # https://github.com/noteed/language-glsl/issues/11 + #- language-glsl GHC 7.10 - prettyclass - QuasiText - union-find From e56dc52a47c62872b267a102375d288b11c55151 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 07:41:46 +0300 Subject: [PATCH 059/287] No longer expected failure for twittner/swagger#3 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8fd5cda6..e89cd853 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1271,9 +1271,6 @@ expected-test-failures: - hedis - redis-io - # https://github.com/twittner/swagger/issues/3 - - swagger - # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 76ec5dbb248fae5875577a5b676c67b8d18d0ace Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 08:46:52 +0300 Subject: [PATCH 060/287] Some more GHC 7.10 build failures --- build-constraints.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0ca9052e..38ab16dd 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -43,7 +43,7 @@ packages: - repa-io - repa-algorithms - repa-devil - - JuicyPixels-repa + #- JuicyPixels-repa GHC 7.10 - cereal-conduit - binary-conduit - lzma-conduit @@ -209,7 +209,8 @@ packages: - tls - tls-debug - vhd - - udbus + # https://github.com/vincenthz/hs-udbus/issues/4 + # - udbus GHC 7.10 - xenstore "Chris Done": @@ -1259,6 +1260,12 @@ expected-test-failures: - hedis - redis-io + # https://code.google.com/p/scrapyourboilerplate/issues/detail?id=26&thanks=26&ts=1430372304, GHC 7.10 + - syb + + # https://github.com/lymar/hastache/issues/47 GHC 7.10 + - hastache + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 @@ -1277,6 +1284,9 @@ expected-haddock-failures: # Not sure why, but it's a temporary package anyway - Cabal-ide-backend + # https://github.com/goldfirere/singletons/issues/120 + - singletons + # Benchmarks which should not be built. Note that Stackage does *not* generally # build benchmarks. The difference here will be whether dependencies for these # benchmarks are included or not. From 4d43ab3196a335eaf6e3c839bca779aa2bad393a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 09:48:18 +0300 Subject: [PATCH 061/287] More GHC 7.10 tweaks --- build-constraints.yaml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 38ab16dd..f70b42e3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -84,7 +84,8 @@ packages: - hmatrix-gsl - hxt - hxt-relaxng - - hybrid-vectors + # https://github.com/ekmett/hybrid-vectors/issues/1 + # - hybrid-vectors GHC 7.10 - indents - language-c - lhs2tex @@ -446,7 +447,8 @@ packages: - Octree - FenwickTree - hPDB - - hPDB-examples + # https://github.com/BioHaskell/hPDB-examples/issues/1 + #- hPDB-examples GHC 7.10 - wordpass - json-autotype @@ -693,7 +695,9 @@ packages: - product-profunctors "Samplecount stefan@samplecount.com @kaoskorobase": - - shake-language-c + [] + # https://github.com/samplecount/shake-language-c/issues/25 + # - shake-language-c GHC 7.10 "Marcin Mrotek ": - diagrams-hsqml @@ -860,10 +864,11 @@ packages: - cabal-file-th "Gershom Bazerman @gbaz": - - jmacro - - jmacro-rpc - - jmacro-rpc-happstack - - jmacro-rpc-snap + # http://hub.darcs.net/gershomb/jmacro/issue/1 GHC 7.10 + #- jmacro + #- jmacro-rpc + #- jmacro-rpc-happstack + #- jmacro-rpc-snap - mbox - kmeans - boolsimplifier @@ -945,9 +950,6 @@ packages: # https://github.com/fpco/stackage/issues/517 - generic-deriving < 1.7 - # https://github.com/Happstack/happstack-server/issues/6 - - happstack-server < 7.4.3 - # https://github.com/fpco/stackage/issues/531 - sbv < 4.3 @@ -1266,6 +1268,12 @@ expected-test-failures: # https://github.com/lymar/hastache/issues/47 GHC 7.10 - hastache + # https://github.com/timjb/aeson-schema/issues/13 GHC 7.10 + - aeson-schema + + # https://github.com/simonmar/alex/issues/62 GHC 7.10 + - alex + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From d430deed7cc6c713b32d589c4782aca540004de1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 10:08:10 +0300 Subject: [PATCH 062/287] Skip Workflow/MFlow for GHC 7.10 agocorona/Workflow#5 --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f70b42e3..f7197416 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -240,8 +240,9 @@ packages: "Alberto G. Corona ": - RefSerialize - TCache - - Workflow - - MFlow + # https://github.com/agocorona/Workflow/issues/5 GHC 7.10 + # - Workflow + # - MFlow "Edward Kmett ": - ad From 5a21a2827071bb7c5d92fbfaedf75f39adeda598 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 10:49:43 +0300 Subject: [PATCH 063/287] biosff and hspec/nanospec#2 --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f7197416..e55732ce 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -518,7 +518,7 @@ packages: - biocore - biofasta - biofastq - - biosff + # - biosff GHC 7.10 - blastxml - bioace - biophd < 0.0.6 || > 0.0.6 @@ -1275,6 +1275,9 @@ expected-test-failures: # https://github.com/simonmar/alex/issues/62 GHC 7.10 - alex + # https://github.com/hspec/nanospec/issues/2 GHC 7.10 + - nanospec + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 7d3aaa3546e1c654419162c66546ff181e102dc0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 11:28:57 +0300 Subject: [PATCH 064/287] More GHC 7.10 stuff (this will continue for a while) --- build-constraints.yaml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e55732ce..7818f83b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -63,7 +63,9 @@ packages: # https://github.com/fpco/stackage/issues/541 # - Chart-diagrams - - compdata + + # https://github.com/pa-ba/compdata/issues/7 GHC 7.10 + # - compdata - configurator - convertible - csv-conduit @@ -462,9 +464,8 @@ packages: - action-permutations - amqp - curl - # GHC 7.10 https://github.com/haskell-suite/haskell-packages/issues/22 - #- haskell-names - #- haskell-packages + - haskell-names + - haskell-packages - heredoc - hse-cpp - immortal @@ -1278,6 +1279,12 @@ expected-test-failures: # https://github.com/hspec/nanospec/issues/2 GHC 7.10 - nanospec + # https://github.com/mvoidex/hdocs/issues/5 GHC 7.10 + - hdocs + + # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 + - http-date + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From f6c9f53d10482bd4d7b9d195aebb211f7f25b3ec Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Thu, 30 Apr 2015 15:52:20 +0700 Subject: [PATCH 065/287] Adds bitcoin-block and bitcoin-types packages --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e89cd853..bc9614b9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -754,8 +754,10 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string + - bitcoin-block - bitcoin-script - bitcoin-tx + - bitcoin-types - hexstring - network-attoparsec - network-anonymous-i2p From abc8ff662dfecf5977bbe74cfdc71f0bb8b309bb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 12:19:14 +0300 Subject: [PATCH 066/287] More GHC 7.10 --- build-constraints.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7818f83b..009417c7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -108,7 +108,8 @@ packages: - statistics-linreg - th-expand-syns - thyme - - webdriver + # https://github.com/kallisti-dev/hs-webdriver/issues/71 + # - webdriver - web-fpco - criterion - th-lift @@ -303,7 +304,8 @@ packages: - semigroupoids - semigroups - speculation - - streams + # https://github.com/ekmett/streams/issues/11 + # - streams GHC 7.10 - tagged - vector-instances - void @@ -1068,7 +1070,6 @@ skipped-tests: - Cabal-ide-backend # QuickCheck 2.8 - - ChasingBottoms - bson - cabal-install - exceptions @@ -1076,7 +1077,6 @@ skipped-tests: - pandoc - testpack - vector - - unordered-containers # 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. @@ -1276,15 +1276,15 @@ expected-test-failures: # https://github.com/simonmar/alex/issues/62 GHC 7.10 - alex - # https://github.com/hspec/nanospec/issues/2 GHC 7.10 - - nanospec - # https://github.com/mvoidex/hdocs/issues/5 GHC 7.10 - hdocs # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 - http-date + # https://github.com/haskell-suite/haskell-names/issues/63 + - haskell-names + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 7e495ddb2df17bc800a9324a9212b1fcaec2ac9b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 13:00:33 +0300 Subject: [PATCH 067/287] lykahb/grounghog#38 --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 009417c7..1f36c410 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -439,7 +439,8 @@ packages: "Boris Lykah ": - groundhog - - groundhog-th + # https://github.com/lykahb/groundhog/issues/38 GHC 7.10 + # - groundhog-th - groundhog-sqlite - groundhog-postgresql - groundhog-mysql @@ -1299,6 +1300,7 @@ expected-haddock-failures: # Requires build before haddock, which doesn't always happen in incremental # builds. Could consider special-casing this requirement. - gtk + - gtk3 # Not sure why, but it's a temporary package anyway - Cabal-ide-backend From 6f8c05766c6477b4129618f23751cdfae12d7e4d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 13:02:20 +0300 Subject: [PATCH 068/287] Use older haskell-packages (Cabal constraint) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e89cd853..832092d4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -916,6 +916,7 @@ packages: - haddock-api < 2.16 - haddock-library < 1.2 - hdocs < 0.4.2 + - haskell-packages < 0.3 # Force a specific version that's compatible with transformers 0.3 - transformers-compat == 0.4.0.3 From 55050b1dd7554e0c07aa8fd6943676a1fb591ce3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 13:17:13 +0300 Subject: [PATCH 069/287] Upper bound on compdata --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 832092d4..de198b57 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -917,6 +917,7 @@ packages: - haddock-library < 1.2 - hdocs < 0.4.2 - haskell-packages < 0.3 + - compdata < 0.10 # Force a specific version that's compatible with transformers 0.3 - transformers-compat == 0.4.0.3 From 9df6b583363a169606a62520b55859f1c577f07f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 13:38:56 +0300 Subject: [PATCH 070/287] More GHC 7.10 issues --- build-constraints.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0c1a1c20..81b58a17 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -580,7 +580,8 @@ packages: - ghc-syb-utils "Boris Buliga ": - - ghc-mod + # https://github.com/kazu-yamamoto/ghc-mod/issues/437 GHC 7.10 + # - ghc-mod - io-choice - system-canonicalpath @@ -727,7 +728,8 @@ packages: "Alexandr Ruchkin voidex@live.com @mvoidex": - hdocs - - hsdev + # https://github.com/kazu-yamamoto/ghc-mod/issues/437 GHC 7.10 + # - hsdev "Aleksey Kliger aleksey@lambdageek.org @lambdageek": - unbound-generics @@ -1285,9 +1287,15 @@ expected-test-failures: # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 - http-date - # https://github.com/haskell-suite/haskell-names/issues/63 + # https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10 - haskell-names + # https://github.com/bos/text/issues/118 GHC 7.10 + - text + + # https://github.com/ekmett/machines/issues/42 GHC 7.10 + - machines + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 140bb479533cd57d93ab8e35b064383cdee7d0df Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 14:20:10 +0300 Subject: [PATCH 071/287] Wash, rinse, repeat (GHC 7.10) --- build-constraints.yaml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 81b58a17..46750a25 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -64,8 +64,7 @@ packages: # https://github.com/fpco/stackage/issues/541 # - Chart-diagrams - # https://github.com/pa-ba/compdata/issues/7 GHC 7.10 - # - compdata + - compdata - configurator - convertible - csv-conduit @@ -169,7 +168,9 @@ packages: - language-javascript "Alfredo Di Napoli ": - - mandrill + [] + # https://github.com/adinapoli/mandrill/issues/14 + # - mandrill GHC 7.10 "Jasper Van der Jeugt": - blaze-html @@ -268,7 +269,8 @@ packages: - distributive - either - eq - - ersatz + # https://github.com/ekmett/ersatz/issues/11 GHC 7.10 + # - ersatz - exceptions - free - graphs @@ -586,7 +588,9 @@ packages: - system-canonicalpath "Yann Esposito ": - - holy-project + [] + # https://github.com/yogsototh/holy-project/issues/5 GHC 7.10 + # - holy-project "Paul Rouse ": - yesod-auth-hashdb @@ -701,9 +705,7 @@ packages: - product-profunctors "Samplecount stefan@samplecount.com @kaoskorobase": - [] - # https://github.com/samplecount/shake-language-c/issues/25 - # - shake-language-c GHC 7.10 + - shake-language-c "Marcin Mrotek ": - diagrams-hsqml @@ -741,7 +743,8 @@ packages: - machines-io - machines-process # on behalf of Bryan O'Sullivan @bos - - wreq + # https://github.com/bos/wreq/issues/61 + # - wreq GHC 7.10 "Andraz Bajt andraz@bajt.me @edofic": - effect-handlers @@ -1296,6 +1299,12 @@ expected-test-failures: # https://github.com/ekmett/machines/issues/42 GHC 7.10 - machines + # https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10 + - hyperloglog + + # https://github.com/acid-state/safecopy/issues/25 GHC 7.10 + - safecopy + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 89216b2a1ce627173e555416d5e9ebbce2a0929d Mon Sep 17 00:00:00 2001 From: ygale Date: Thu, 30 Apr 2015 14:29:45 +0300 Subject: [PATCH 072/287] Add timezone packages --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index eae0649d..d5735882 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -913,6 +913,10 @@ packages: "David Raymond Christiansen @david-christiansen": - annotated-wl-pprint + "Yitz Gale gale@sefer.org @ygale" + - timezone-series + - timezone-olson + "Stackage upper bounds": # GHC 7.8 uppdate bound - haddock-api < 2.16 From 92b6f43d12594ff0b2799289cb1cb2eeb288016a Mon Sep 17 00:00:00 2001 From: ygale Date: Thu, 30 Apr 2015 14:48:50 +0300 Subject: [PATCH 073/287] Missing colon. --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d5735882..046285d7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -913,7 +913,7 @@ packages: "David Raymond Christiansen @david-christiansen": - annotated-wl-pprint - "Yitz Gale gale@sefer.org @ygale" + "Yitz Gale gale@sefer.org @ygale": - timezone-series - timezone-olson From a8d6f1d3eca257e3f8427fdb5e760b0fd144e3a9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 16:17:05 +0300 Subject: [PATCH 074/287] More GHC 7.10 changes --- build-constraints.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 46750a25..77f7e78d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -92,7 +92,8 @@ packages: - lhs2tex - persistent-mongoDB - pretty-class - - quandl-api + # https://github.com/pvdbrand/quandl-api/issues/2 GHC 7.10 + #- quandl-api - random-fu - random-source - shelly @@ -455,8 +456,7 @@ packages: - Octree - FenwickTree - hPDB - # https://github.com/BioHaskell/hPDB-examples/issues/1 - #- hPDB-examples GHC 7.10 + - hPDB-examples - wordpass - json-autotype @@ -482,9 +482,8 @@ packages: - tasty-quickcheck - tasty-smallcheck - time-lens - # GHC 7.10 - #- timezone-olson - #- timezone-series + - timezone-olson + - timezone-series - traverse-with-class "George Giorgidze ": @@ -515,7 +514,7 @@ packages: "Clint Adams ": #- hOpenPGP GHC 7.10, via syb-with-class - openpgp-asciiarmor - - MusicBrainz + # - MusicBrainz GHC 7.10, time 1.5 - DAV #- hopenpgp-tools GHC 7.10, via syb-with-class @@ -1305,6 +1304,9 @@ expected-test-failures: # https://github.com/acid-state/safecopy/issues/25 GHC 7.10 - safecopy + # https://github.com/ekmett/linear/issues/75 GHC 7.10 + - linear + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 597b38479f5a98b0b6491c436180243610cc5a61 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 16:46:15 +0300 Subject: [PATCH 075/287] Ignore .swp files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6b60ace9..0f9f8e70 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /logs/ nightly-*.yaml lts-*.yaml +*.swp From af0d59eb48b69322633d18814b429288ee7181ae Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 17:16:24 +0300 Subject: [PATCH 076/287] Workflow and aeson-schema --- build-constraints.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 77f7e78d..c394ba0e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -245,9 +245,8 @@ packages: "Alberto G. Corona ": - RefSerialize - TCache - # https://github.com/agocorona/Workflow/issues/5 GHC 7.10 - # - Workflow - # - MFlow + - Workflow + - MFlow "Edward Kmett ": - ad @@ -1277,9 +1276,6 @@ expected-test-failures: # https://github.com/lymar/hastache/issues/47 GHC 7.10 - hastache - # https://github.com/timjb/aeson-schema/issues/13 GHC 7.10 - - aeson-schema - # https://github.com/simonmar/alex/issues/62 GHC 7.10 - alex From adce4ca6e345b97bfdfd696afc0bfab7bb7a0208 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 17:56:03 +0300 Subject: [PATCH 077/287] Switch groundhog-th and MFlow --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c394ba0e..81418309 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -246,7 +246,8 @@ packages: - RefSerialize - TCache - Workflow - - MFlow + # https://github.com/agocorona/MFlow/issues/60 GHC 7.10 + # - MFlow "Edward Kmett ": - ad @@ -441,8 +442,7 @@ packages: "Boris Lykah ": - groundhog - # https://github.com/lykahb/groundhog/issues/38 GHC 7.10 - # - groundhog-th + - groundhog-th - groundhog-sqlite - groundhog-postgresql - groundhog-mysql From 991c70b9626f02e44b0d1e96b09b5f1c4acb468c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 18:14:37 +0300 Subject: [PATCH 078/287] Switch to GHC 7.10 in Docker --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8326f435..aa2f781c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,9 +14,9 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh RUN rm /tmp/debian-bootstrap.sh -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.20 ghc-7.8.4 ghc-7.8.4-htmldocs alex-3.1.3 happy-1.19.4 sudo +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.22 ghc-7.10.1 ghc-7.10.1-htmldocs alex-3.1.3 happy-1.19.4 sudo -ENV 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 +ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.10.1/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin RUN cabal update RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage From 91d7b1e7ac5915d2c9adad2bb6b9ea4e9f683567 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 18:36:06 +0300 Subject: [PATCH 079/287] Allow mandrill again adinapoli/mandrill#14 --- build-constraints.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 81418309..c6745d17 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -169,9 +169,7 @@ packages: - language-javascript "Alfredo Di Napoli ": - [] - # https://github.com/adinapoli/mandrill/issues/14 - # - mandrill GHC 7.10 + - mandrill "Jasper Van der Jeugt": - blaze-html From 26baa8559123ddbdf4859e350bc3bd54f81fbbec Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 30 Apr 2015 20:48:06 +0300 Subject: [PATCH 080/287] Docker: don't check --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59d14682..3809dd6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,5 +21,3 @@ ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.8.4 RUN cabal update 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 RUN 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 - -RUN cd /home/stackage && cabal update && stackage-curator check From 2a114737d7a67b29891fa847596fb25a5de0a259 Mon Sep 17 00:00:00 2001 From: David Turner Date: Fri, 1 May 2015 05:47:16 +0100 Subject: [PATCH 081/287] Reinstate alarmclock and bank-holidays-england New versions with relaxed dependency constraints have been uploaded. --- build-constraints.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c6745d17..a9cdc621 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -712,10 +712,8 @@ packages: - type-list "David Turner ": - [] - # GHC 7.10 - #- alarmclock - #- bank-holidays-england + - alarmclock + - bank-holidays-england "Haskell Servant jkarni@gmail.com @jkarni": - servant From 5602aeb5c2a4bf8c6c295ab20874e0f09f20eedc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 07:47:42 +0300 Subject: [PATCH 082/287] Remove upper bounds and close #531 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index eae0649d..58f86f05 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -952,9 +952,6 @@ packages: # https://github.com/Happstack/happstack-server/issues/6 - happstack-server < 7.4.3 - # https://github.com/fpco/stackage/issues/531 - - sbv < 4.3 - # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 From af49d1faa5d1acdc62c4bfbae33dc18a4af9b6be Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 07:54:00 +0300 Subject: [PATCH 083/287] Use image tags --- automated/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 3d92d45d..3f730091 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -4,6 +4,7 @@ set -eux ROOT=$(cd $(dirname $0) ; pwd) TARGET=$1 +IMAGE=snoyberg/stackage:$(echo $TARGET | cut -d- -f 1) TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1) PLAN_FILE=current-plan.yaml BUNDLE_FILE=current.bundle @@ -68,6 +69,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely -docker run $ARGS_PREBUILD snoyberg/stackage /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install" -docker run $ARGS_BUILD snoyberg/stackage stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET -docker run $ARGS_UPLOAD snoyberg/stackage /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 --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 && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install" +docker run $ARGS_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_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 --target $TARGET" From c168eb4399baef40d7e6b02faeca4fbd9fcebe34 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 08:04:38 +0300 Subject: [PATCH 084/287] Apply fix for mvoidex/hdocs#5 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0408ed34..26628534 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1272,9 +1272,6 @@ expected-test-failures: # https://github.com/simonmar/alex/issues/62 GHC 7.10 - alex - # https://github.com/mvoidex/hdocs/issues/5 GHC 7.10 - - hdocs - # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 - http-date From b13dd6a21d7e44e1921be52393095e5089e77cfc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 08:26:21 +0300 Subject: [PATCH 085/287] Remove expected Haddock failure goldfirere/singletons#120 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 26628534..0cb852b8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1312,9 +1312,6 @@ expected-haddock-failures: # Not sure why, but it's a temporary package anyway - Cabal-ide-backend - # https://github.com/goldfirere/singletons/issues/120 - - singletons - # Benchmarks which should not be built. Note that Stackage does *not* generally # build benchmarks. The difference here will be whether dependencies for these # benchmarks are included or not. From c1088228f93e3b682945b4a0964ffa4a795d02e9 Mon Sep 17 00:00:00 2001 From: David Turner Date: Fri, 1 May 2015 08:31:20 +0100 Subject: [PATCH 086/287] Add @davecturner github username --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 58f86f05..f10dff45 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -692,7 +692,7 @@ packages: "Marcin Mrotek ": - type-list - "David Turner ": + "David Turner @davecturner": - alarmclock - bank-holidays-england From ab0e030ce961831903a5bf2298305e274507caad Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 11:20:39 +0300 Subject: [PATCH 087/287] Add accelerate back, expect alex tests to pass --- build-constraints.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0cb852b8..65e2a8b2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -282,7 +282,7 @@ packages: - lca - lens - linear - #- linear-accelerate GHC 7.10 + - linear-accelerate - log-domain - machines - monadic-arrays @@ -388,8 +388,7 @@ packages: - containers-unicode-symbols "Trevor L. McDonell ": - [] - # - accelerate GHC 7.10 + - accelerate "Dan Burton ": - yesod-gitrev @@ -1269,9 +1268,6 @@ expected-test-failures: # https://github.com/lymar/hastache/issues/47 GHC 7.10 - hastache - # https://github.com/simonmar/alex/issues/62 GHC 7.10 - - alex - # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 - http-date From 5ac2788a460ebc6f1a9d53ca32ff4977d763cfeb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 11:32:11 +0300 Subject: [PATCH 088/287] Actually, alex is not on Hackage yet --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 65e2a8b2..ac76a63f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1268,6 +1268,9 @@ expected-test-failures: # https://github.com/lymar/hastache/issues/47 GHC 7.10 - hastache + # https://github.com/simonmar/alex/issues/62 GHC 7.10 + - alex + # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 - http-date From e649b0d63dd11a6aa7e0413b1b715e29993f7023 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 1 May 2015 13:31:00 +0300 Subject: [PATCH 089/287] Add cabal-rpm back juhp/cabal-rpm#18 --- build-constraints.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ac76a63f..4220930a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -748,9 +748,7 @@ packages: - HaskellNet "Jens Petersen juhpetersen@gmail.com @juhp": - [] - # https://github.com/juhp/cabal-rpm/issues/18 - # - cabal-rpm # GHC 7.10 + - cabal-rpm "Renzo Carbonara renzocarbonara@gmail.com @k0001": - network-simple @@ -1015,6 +1013,9 @@ package-flags: HsOpenSSL: fast-bignum: false + cabal-rpm: + old-locale: false + # By skipping a test suite, we do not pull in the build dependencies skipped-tests: - ReadArgs # old version of hspec From b35f189c68dae490e5169ae9669e10bbea1f1549 Mon Sep 17 00:00:00 2001 From: Yann Esposito Date: Fri, 1 May 2015 18:55:38 +0200 Subject: [PATCH 090/287] Fixed an "holy-project" build issue The latest version 0.2.0.0 of holy-project should compile now. --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4220930a..79eeaff6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -584,8 +584,8 @@ packages: "Yann Esposito ": [] - # https://github.com/yogsototh/holy-project/issues/5 GHC 7.10 - # - holy-project + # Should have fixed: https://github.com/yogsototh/holy-project/issues/5 GHC 7.10 + - holy-project "Paul Rouse ": - yesod-auth-hashdb From f35f993530d3b1d636b4875c33105f93e01ef9c4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 2 May 2015 21:10:43 +0300 Subject: [PATCH 091/287] Add Cabal to skipped tests (QuickCheck 2.8) --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4220930a..4826831b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1076,6 +1076,7 @@ skipped-tests: - pandoc - testpack - vector + - Cabal # 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. From 0d1f62abb8c3977bfd5aab83c662f7ffc915d917 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 2 May 2015 21:14:05 +0300 Subject: [PATCH 092/287] Patch up PR for yogsototh/holy-project#5 --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2d632fbd..4a7540bc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -583,8 +583,6 @@ packages: - system-canonicalpath "Yann Esposito ": - [] - # Should have fixed: https://github.com/yogsototh/holy-project/issues/5 GHC 7.10 - holy-project "Paul Rouse ": From 7a3f8b0658a54e2fc8f63ca46adcd8ca93d2ad47 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 07:56:32 +0300 Subject: [PATCH 093/287] stackage-build-plan --- README.md | 1 + build-constraints.yaml | 1 + stackage/stackage.cabal | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2cc5a0c4..5b15fd98 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ project information. In addition, we have the following repositories: * [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) * [stackage-install](https://github.com/fpco/stackage-install) [![Build Status](https://travis-ci.org/fpco/stackage-install.svg?branch=master)](https://travis-ci.org/fpco/stackage-install) +* [stackage-build-plan](https://github.com/fpco/stackage-build-plan) [![Build Status](https://travis-ci.org/fpco/stackage-build-plan.svg?branch=master)](https://travis-ci.org/fpco/stackage-build-plan) Get your package included ------------------------- diff --git a/build-constraints.yaml b/build-constraints.yaml index f10dff45..0b5500d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -101,6 +101,7 @@ packages: - stackage-upload - stackage-cli - stackage-install + - stackage-build-plan - statistics-linreg - th-expand-syns - thyme diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal index ca16cdd8..d9a004d1 100644 --- a/stackage/stackage.cabal +++ b/stackage/stackage.cabal @@ -1,5 +1,5 @@ name: stackage -version: 0.7.1.0 +version: 0.7.2.0 synopsis: Dummy package forcing installation of other Stackage packages homepage: https://www.stackage.org/ license: MIT @@ -18,6 +18,7 @@ library , stackage-update , stackage-upload , stackage-install + , stackage-build-plan default-language: Haskell2010 source-repository head From 53376ff60d0d7881419fec85044aec560c81acb0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 08:19:23 +0300 Subject: [PATCH 094/287] Skip tests for yesodweb/Shelly.hs#98 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b5500d2..4636859b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1084,6 +1084,9 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry + # https://github.com/yesodweb/Shelly.hs/pull/98 + - shelly + # 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: From 241dbca1f1373c392ff67709afee9aa4d76efdeb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 08:31:04 +0300 Subject: [PATCH 095/287] Allow setting constraints on create-plan --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 3d92d45d..08a344a8 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -68,6 +68,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely -docker run $ARGS_PREBUILD snoyberg/stackage /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install" +docker run $ARGS_PREBUILD snoyberg/stackage /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_BUILD snoyberg/stackage stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET docker run $ARGS_UPLOAD snoyberg/stackage /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 --target $TARGET" From 26936be15c42e4db4691f72519d63b76fc10808c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 09:49:55 +0300 Subject: [PATCH 096/287] Don't skip tests yesodweb/Shelly.hs#98 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4636859b..0b5500d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1084,9 +1084,6 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry - # https://github.com/yesodweb/Shelly.hs/pull/98 - - shelly - # 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: From 98799db672ceeeed70cbe39d8afd00c95ba7ce9d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 13:31:39 +0300 Subject: [PATCH 097/287] Expected test failure yesodweb/Shelly.hs#99 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b5500d2..70cab47c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1273,6 +1273,9 @@ expected-test-failures: - hedis - redis-io + # https://github.com/yesodweb/Shelly.hs/issues/99 + - shelly + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 13ec252971064c1fb6289f1789034bb67c4a8fb0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 17:49:52 +0300 Subject: [PATCH 098/287] Remove expected test failure ekmett/machines#42 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f9062e2c..d8aa12b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1281,9 +1281,6 @@ expected-test-failures: # https://github.com/bos/text/issues/118 GHC 7.10 - text - # https://github.com/ekmett/machines/issues/42 GHC 7.10 - - machines - # https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10 - hyperloglog From 4d9c77c64e2ec66dc104c132193bb4455b6b82a4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 18:36:27 +0300 Subject: [PATCH 099/287] Remove expected test failure yesodweb/Shelly.hs#99 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 70cab47c..0b5500d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1273,9 +1273,6 @@ expected-test-failures: - hedis - redis-io - # https://github.com/yesodweb/Shelly.hs/issues/99 - - shelly - # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From acb7078df83d68c58abc7581c8f33866e05e93eb Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Mon, 4 May 2015 11:36:47 +0700 Subject: [PATCH 100/287] Adds bitcoin-api --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b5500d2..9d9fa682 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -755,6 +755,7 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string + - bitcoin-api - bitcoin-block - bitcoin-script - bitcoin-tx From 0717bb83e0df6fcd69014460561366a473b8e5b7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 4 May 2015 08:48:51 +0300 Subject: [PATCH 101/287] Use mtl-compat compatible by default with transformers 0.3 #522 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ddbdc7b7..01935e8c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -930,6 +930,7 @@ packages: # Force a specific version that's compatible with transformers 0.3 - transformers-compat == 0.4.0.3 + - mtl-compat == 0.2.1.1 # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From 4a80873347bc2cd4d294bf6619a6803ebbafdc8b Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Mon, 4 May 2015 12:14:22 +0100 Subject: [PATCH 102/287] Remove trailing whitespace --- build-constraints.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 01935e8c..ea8b8687 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -877,11 +877,11 @@ packages: - plot-gtk3 - vector-buffer - hmatrix-repa - + "Noam Lewis @sinelaw": - xml-to-json - xml-to-json-fast - + "Tim Baumann @timjb": - aeson-schema @@ -891,7 +891,7 @@ packages: "Stefan Saasen ": - jwt - + "Sven Bartscher sven.bartscher@weltraumschlangen.de @kritzefitz": - setlocale @@ -905,21 +905,21 @@ packages: - islink - linux-file-extents - linux-namespaces - + "Will Coster @fimad": - scalpel - + "Smirnov Alexey @chemist": - snmp - agentx - + "David Raymond Christiansen @david-christiansen": - annotated-wl-pprint "Yitz Gale gale@sefer.org @ygale": - timezone-series - timezone-olson - + "Stackage upper bounds": # GHC 7.8 uppdate bound - haddock-api < 2.16 From f26de0493774a131df57a57fa1377d6a0024be5e Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Mon, 4 May 2015 12:14:48 +0100 Subject: [PATCH 103/287] Add sandi --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ea8b8687..3218ee61 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -920,6 +920,9 @@ packages: - timezone-series - timezone-olson + "Josh Holland josh@inv.alid.pw @jshholland": + - sandi + "Stackage upper bounds": # GHC 7.8 uppdate bound - haddock-api < 2.16 From c8e8a52e2f69731f56413008abc3aaec3f77fca2 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Mon, 4 May 2015 15:05:30 +0100 Subject: [PATCH 104/287] Add data-ordlist --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3218ee61..d25ac637 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -922,6 +922,7 @@ packages: "Josh Holland josh@inv.alid.pw @jshholland": - sandi + - data-ordlist "Stackage upper bounds": # GHC 7.8 uppdate bound From afa791c8437a454de73054a443572194f7e320db Mon Sep 17 00:00:00 2001 From: Harry Garrood Date: Mon, 4 May 2015 16:54:12 +0100 Subject: [PATCH 105/287] Add aeson-better-errors --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d25ac637..266a0e8f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -923,6 +923,9 @@ packages: "Josh Holland josh@inv.alid.pw @jshholland": - sandi - data-ordlist + + "Harry Garrood @hdgarrood": + - aeson-better-errors "Stackage upper bounds": # GHC 7.8 uppdate bound From 4d6305626a97003b5408a832935978fc4f3767f8 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 4 May 2015 13:00:37 -0700 Subject: [PATCH 106/287] Add stackage-cabal, stackage-sandbox, stackage-setup to the family --- stackage/stackage.cabal | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal index d9a004d1..8dc126ad 100644 --- a/stackage/stackage.cabal +++ b/stackage/stackage.cabal @@ -1,5 +1,5 @@ name: stackage -version: 0.7.2.0 +version: 0.7.3.0 synopsis: Dummy package forcing installation of other Stackage packages homepage: https://www.stackage.org/ license: MIT @@ -19,6 +19,9 @@ library , stackage-upload , stackage-install , stackage-build-plan + , stackage-cabal + , stackage-sandbox + , stackage-setup default-language: Haskell2010 source-repository head From ab30e81f1535ff1b380f74b8699ed02bff3bdd88 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Mon, 4 May 2015 13:36:21 -0700 Subject: [PATCH 107/287] ChangeLog 0.7.3.0 --- stackage/ChangeLog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stackage/ChangeLog.md b/stackage/ChangeLog.md index 51676ad3..ab298b5d 100644 --- a/stackage/ChangeLog.md +++ b/stackage/ChangeLog.md @@ -1,3 +1,7 @@ +## 0.7.3.0 + +* Added the executables split off from stackage-cli. + ## 0.7.0.0 * First release of this incarnation of the stackage package. Previously, this From 67c0f06164326136b807f1ec12b8823a7d7e3850 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 09:08:49 +0300 Subject: [PATCH 108/287] Temporarily block sandi #560 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2befe859..38e181f1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -942,7 +942,8 @@ packages: - timezone-olson "Josh Holland josh@inv.alid.pw @jshholland": - - sandi + # https://github.com/fpco/stackage/issues/560 + # - sandi GHC 7.10 - data-ordlist "Harry Garrood @hdgarrood": From 5d0e52d01c7a4f0569f8ed23c01cb26aeb7fdac7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 09:08:58 +0300 Subject: [PATCH 109/287] Upper bound for #559 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 38e181f1..327fccc9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -972,6 +972,9 @@ packages: # https://github.com/fpco/stackage/issues/549 - tttool < 1.4 + # https://github.com/fpco/stackage/issues/559 + - vector-algorithms < 0.7 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 6cc802388d459b5295d9e375081398cd34a0e5ed Mon Sep 17 00:00:00 2001 From: Timothy Jones Date: Tue, 5 May 2015 18:27:48 +1200 Subject: [PATCH 110/287] Remove cabal-test-quickcheck, restore http-media Packages tested with cabal-test-quickcheck cannot pass on all of the required platforms: it requires that Cabal and cabal-install be on the same side of version 1.19, but a build against GHC 7.8 will tend to use Cabal-1.18 with cabal-install-1.20 or higher. As such, the library has been removed. The http-media package, which used cabal-test-quickcheck, is now expected to build its test suite and pass all tests. --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 327fccc9..adb58c88 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -783,7 +783,6 @@ packages: - network-anonymous-i2p "Timothy Jones git@zmthy.io @zmthy": - - cabal-test-quickcheck - http-media "Greg V greg@unrelenting.technology @myfreeweb": @@ -1248,9 +1247,6 @@ expected-test-failures: # https://github.com/jberryman/directory-tree/issues/4 - directory-tree - # https://github.com/zmthy/http-media/issues/11 - - http-media - # https://github.com/ekmett/semigroupoids/issues/18 - semigroupoids From d38554f725a6b1335e89eda473ab4d59dcc67d50 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 11:14:13 +0300 Subject: [PATCH 111/287] Remove blocked package and close #560 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index adb58c88..85038c26 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -941,8 +941,7 @@ packages: - timezone-olson "Josh Holland josh@inv.alid.pw @jshholland": - # https://github.com/fpco/stackage/issues/560 - # - sandi GHC 7.10 + - sandi - data-ordlist "Harry Garrood @hdgarrood": From 8f38b985478c6b0d7022250b0dca855c86e5c273 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 11:17:04 +0300 Subject: [PATCH 112/287] Add back BlogLiterately --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 85038c26..9eedf1b0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -343,9 +343,8 @@ packages: "Brent Yorgey ": - active - # Temporarily disabled due to restrictive lens upper bound - #- BlogLiterately - #- BlogLiterately-diagrams + - BlogLiterately + # - BlogLiterately-diagrams GHC 7.10 - diagrams # https://github.com/fpco/stackage/issues/443 From 7b0f29a078487035c0a9c5bbb8c7e7cac7de39b4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 13:36:41 +0300 Subject: [PATCH 113/287] Add GHC major version to constraints file --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9eedf1b0..d0be6812 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1,3 +1,5 @@ +ghc-major-version: "7.10" + # Constraints for brand new builds packages: "Michael Snoyman michael@snoyman.com @snoyberg": From 2b4199b417c10efd5ea371df7b7b91a8535ef62b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 15:27:48 +0300 Subject: [PATCH 114/287] Expected test failure haskell/haddock#390 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d0be6812..f16ac465 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1303,6 +1303,9 @@ expected-test-failures: # https://github.com/ekmett/linear/issues/75 GHC 7.10 - linear + # https://github.com/haskell/haddock/issues/390 + - haddock-library + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 4a9725ccf89cd2141052b8761d55727d43f1f9be Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 17:55:58 +0300 Subject: [PATCH 115/287] Temporarily block bitcoin-api due to broken wreq --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f16ac465..7a97e815 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -774,7 +774,7 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string - - bitcoin-api + # - bitcoin-api GHC 7.10, via wreq - bitcoin-block - bitcoin-script - bitcoin-tx From 79bf759f8dd5d02a0c0c71363fc63dd89b911112 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 18:32:06 +0300 Subject: [PATCH 116/287] Temporary block byorgey/BlogLiterately#20 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7a97e815..ee68ba1a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -345,7 +345,8 @@ packages: "Brent Yorgey ": - active - - BlogLiterately + # https://github.com/byorgey/BlogLiterately/issues/20 + # - BlogLiterately GHC 7.10 # - BlogLiterately-diagrams GHC 7.10 - diagrams From 7ad175e95d177babaefaa57e3807e3a60b33056c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 5 May 2015 19:39:58 +0300 Subject: [PATCH 117/287] Add expected test failure ekmett/machines#44 --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index ee68ba1a..6295e321 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1304,9 +1304,12 @@ expected-test-failures: # https://github.com/ekmett/linear/issues/75 GHC 7.10 - linear - # https://github.com/haskell/haddock/issues/390 + # https://github.com/haskell/haddock/issues/390 GHC 7.10 - haddock-library + # https://github.com/ekmett/machines/issues/44 GHC 7.10 + - machines + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From a568d0b0d98d9fc13d7a3d3f5724ed5319a50004 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 06:18:27 +0300 Subject: [PATCH 118/287] Expected test failure ivanperez-keera/Yampa#10 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6295e321..b7f1f0b4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1310,6 +1310,9 @@ expected-test-failures: # https://github.com/ekmett/machines/issues/44 GHC 7.10 - machines + # https://github.com/ivanperez-keera/Yampa/issues/10 + - Yampa + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From d874e974edad90ce5164a11e8d3282a6562082e9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 06:20:13 +0300 Subject: [PATCH 119/287] Remove upper bound and close #559 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b7f1f0b4..ec971f92 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -972,9 +972,6 @@ packages: # https://github.com/fpco/stackage/issues/549 - tttool < 1.4 - # https://github.com/fpco/stackage/issues/559 - - vector-algorithms < 0.7 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From b8b491fc10a97998ebc74a10158f7308e41e667b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 06:26:28 +0300 Subject: [PATCH 120/287] Add some more Stackage tools explicitly --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ec971f92..c6f38900 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -108,6 +108,9 @@ packages: - stackage-cli - stackage-install - stackage-build-plan + - stackage-cabal + - stackage-sandbox + - stackage-setup - statistics-linreg - th-expand-syns - thyme From 76b25e903aaedf16bb999cc5167917da3403e0e0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 06:47:58 +0300 Subject: [PATCH 121/287] Remove expected test failure ekmett/machines#44 --- build-constraints.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c6f38900..35fa4d2a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1307,12 +1307,10 @@ expected-test-failures: # https://github.com/haskell/haddock/issues/390 GHC 7.10 - haddock-library - # https://github.com/ekmett/machines/issues/44 GHC 7.10 - - machines - # https://github.com/ivanperez-keera/Yampa/issues/10 - Yampa +>>>>>>> Remove expected test failure ekmett/machines#44 # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 592f19420dcfffb3463fbe6d5588da50294e369f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 06:57:59 +0300 Subject: [PATCH 122/287] Remove rebase artifact --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 35fa4d2a..9166301a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1310,7 +1310,6 @@ expected-test-failures: # https://github.com/ivanperez-keera/Yampa/issues/10 - Yampa ->>>>>>> Remove expected test failure ekmett/machines#44 # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 3e3f75365218c9d5fb1b3e5c93278c879eb90424 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 07:10:36 +0300 Subject: [PATCH 123/287] Add back expected test failure ekmett/machines#44 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9166301a..c0c783b2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1310,6 +1310,9 @@ expected-test-failures: # https://github.com/ivanperez-keera/Yampa/issues/10 - Yampa + # https://github.com/ekmett/machines/issues/44 + - machines + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 94e6967489f2c2738139e9d208fc50d1b87f968f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 07:11:20 +0300 Subject: [PATCH 124/287] Remove expected test failure ivanperez-keera/Yampa#10 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c0c783b2..4ce72064 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1307,9 +1307,6 @@ expected-test-failures: # https://github.com/haskell/haddock/issues/390 GHC 7.10 - haddock-library - # https://github.com/ivanperez-keera/Yampa/issues/10 - - Yampa - # https://github.com/ekmett/machines/issues/44 - machines From 66cf2064bd2b205719b8a5c61ed636ede9050cdd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 07:20:30 +0300 Subject: [PATCH 125/287] Remove non-library packages --- stackage/stackage.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal index 8dc126ad..9988196e 100644 --- a/stackage/stackage.cabal +++ b/stackage/stackage.cabal @@ -1,5 +1,5 @@ name: stackage -version: 0.7.3.0 +version: 0.7.3.1 synopsis: Dummy package forcing installation of other Stackage packages homepage: https://www.stackage.org/ license: MIT @@ -19,9 +19,9 @@ library , stackage-upload , stackage-install , stackage-build-plan - , stackage-cabal - , stackage-sandbox - , stackage-setup + -- , stackage-cabal + -- , stackage-sandbox + -- , stackage-setup default-language: Haskell2010 source-repository head From 13821e67e8fd2b8e013babf04b2d580b46192055 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 6 May 2015 09:40:10 +0300 Subject: [PATCH 126/287] Remove manual flags for mtl-compat stackage-curator#1 --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4ce72064..3660239b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1015,10 +1015,6 @@ package-flags: tar: old-time: false - mtl-compat: - two-point-one: false - two-point-two: false - # https://github.com/fpco/stackage/pull/482#issuecomment-83635207 jose-jwt: doctest: false From a889e1c59e6c1ba40f7f34cef4a3d27c7b57cd68 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 6 May 2015 09:23:23 +0200 Subject: [PATCH 127/287] Add feed and time-compat --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3660239b..01ad336b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -433,7 +433,9 @@ packages: - fay-jquery - fay-text - fay-uri + - feed - snaplet-fay + - time-compat "Sebastiaan Visser ": - clay From 756ea9785a14b48038b59d4f0ff93b3a20b7b139 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 6 May 2015 15:57:00 -0700 Subject: [PATCH 128/287] Add lib-enabled versions of the plugins --- stackage/stackage.cabal | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal index 9988196e..e56f30e0 100644 --- a/stackage/stackage.cabal +++ b/stackage/stackage.cabal @@ -1,5 +1,5 @@ name: stackage -version: 0.7.3.1 +version: 0.7.3.2 synopsis: Dummy package forcing installation of other Stackage packages homepage: https://www.stackage.org/ license: MIT @@ -14,14 +14,14 @@ cabal-version: >=1.10 library exposed-modules: Stackage.Dummy build-depends: base < 10 - , stackage-cli + , stackage-cli >= 0.1.0 , stackage-update , stackage-upload , stackage-install , stackage-build-plan - -- , stackage-cabal - -- , stackage-sandbox - -- , stackage-setup + , stackage-cabal >= 0.1.1 + , stackage-sandbox >= 0.1.1 + , stackage-setup >= 0.0.1 default-language: Haskell2010 source-repository head From 95f2f4c9d515bcd5941e6447868c8c15bcc92e59 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 7 May 2015 06:32:32 +0300 Subject: [PATCH 129/287] Add back BlogLiterately --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 01ad336b..c955706a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -348,8 +348,7 @@ packages: "Brent Yorgey ": - active - # https://github.com/byorgey/BlogLiterately/issues/20 - # - BlogLiterately GHC 7.10 + - BlogLiterately # - BlogLiterately-diagrams GHC 7.10 - diagrams From e658e7de3f065cc22b551aa308a3372bba45c223 Mon Sep 17 00:00:00 2001 From: Mitchell Rosen Date: Wed, 6 May 2015 22:41:23 -0700 Subject: [PATCH 130/287] Update build-constraints.yaml --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c955706a..3fec63bb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -952,6 +952,9 @@ packages: "Harry Garrood @hdgarrood": - aeson-better-errors + + "Mitchell Rosen Date: Thu, 7 May 2015 11:48:15 +0300 Subject: [PATCH 131/287] Add wai-middleware-crowd --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3fec63bb..8d7620c7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -145,6 +145,7 @@ packages: - hackage-mirror - wai-middleware-consul + - wai-middleware-crowd - monad-logger-json - monad-logger-syslog From 85f39cfb7418097cffe3c1b0cc229bfa4974425e Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Fri, 8 May 2015 11:02:57 +0200 Subject: [PATCH 132/287] Add through-text --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8d7620c7..2ae56650 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -436,6 +436,7 @@ packages: - feed - snaplet-fay - time-compat + - through-text "Sebastiaan Visser ": - clay From 1fb9dcab3a83af87dc3f2f05928e325ed2445c6b Mon Sep 17 00:00:00 2001 From: Jeffrey Rosenbluth Date: Fri, 8 May 2015 09:22:47 -0400 Subject: [PATCH 133/287] Update build-constraints.yaml --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2ae56650..9f6c8c4d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -775,6 +775,8 @@ packages: #- diagrams-canvas GHC 7.10, via blank-canvas - diagrams-rasterific - lucid-svg + - diagrams-html5 + - static-canvas "Gabríel Arthúr Pétursson gabriel@system.is": - sdl2 From 603da9537e42258dda0c5d3d144ac4d2c65c284b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 9 May 2015 20:50:51 +0300 Subject: [PATCH 134/287] Upper bounds for #568 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9f6c8c4d..f4a7da28 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -983,6 +983,9 @@ packages: # https://github.com/fpco/stackage/issues/549 - tttool < 1.4 + # https://github.com/fpco/stackage/issues/568 + - pandoc-citeproc < 0.7 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From a44ece59f8f42aef45fa2ec6ae20ef83601cf83a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 10 May 2015 09:09:23 +0300 Subject: [PATCH 135/287] Unblock jvranish/FixedList#1 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f4a7da28..68a51027 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -75,8 +75,7 @@ packages: - executable-hash - executable-path - fgl - # https://github.com/jvranish/FixedList/issues/1 - #- fixed-list GHC 7.10 + - fixed-list - foreign-store - formatting #- fpco-api From ca23597be5380e9f880b8d8be0b3114bc2dfdfe5 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Sat, 9 May 2015 23:38:57 -0700 Subject: [PATCH 136/287] Add Chart-cairo and ghc-events --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 68a51027..0886a714 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -645,8 +645,10 @@ packages: - parallel-io - text-binary - wl-pprint-text + - Chart-cairo + - ghc-events - "Michael Sloan ": - th-orphans - th-reify-many From d3eaeae3e283d24d2190f38e4cdc2e8b5a03ef1c Mon Sep 17 00:00:00 2001 From: Christiaan Baaij Date: Sun, 10 May 2015 11:33:08 +0200 Subject: [PATCH 137/287] Add clash packages --- build-constraints.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0886a714..f78ae8c2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -960,6 +960,14 @@ packages: "Mitchell Rosen @christiaanb": + - ghc-typelits-natnormalise + - clash-prelude + - clash-lib + - clash-vhdl + - clash-systemverilog + - clash-ghc "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 From 93dcb1e73b3b07a8a646ff4a07660d5f47d4468c Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Sun, 10 May 2015 18:09:01 +0700 Subject: [PATCH 138/287] Adds bitcoin-api-extra --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f78ae8c2..75dd99c2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -785,6 +785,7 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string # - bitcoin-api GHC 7.10, via wreq + # - bitcoin-api-extra GHC 7.10, via wreq - bitcoin-block - bitcoin-script - bitcoin-tx From fae208eba3789880327480fe0b133545f98973f5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 10 May 2015 16:28:42 +0300 Subject: [PATCH 139/287] DOT_STACKAGE_DIR --- automated/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 31cc1804..21abf2e5 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -12,7 +12,7 @@ BUNDLE_FILE=current.bundle CABAL_DIR=$ROOT/cabal GHC_DIR=$ROOT/ghc CURATOR_DIR=$ROOT/stackage-curator -UPDATE_DIR=$ROOT/stackage-update +DOT_STACKAGE_DIR=$ROOT/dot-stackage WORKDIR=$TROOT/work SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1) @@ -20,7 +20,7 @@ mkdir -p \ "$CABAL_DIR" \ "$GHC_DIR" \ "$CURATOR_DIR" \ - "$UPDATE_DIR" \ + "$DOT_STACKAGE_DIR" \ "$WORKDIR" \ "$SSH_DIR" @@ -64,7 +64,7 @@ chmod +x stackage-curator ) ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro" -ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $UPDATE_DIR:/home/stackage/.stackage-update" +ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage" ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro" ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" From 3a0f858e793418a97ce5055e2f92c5318bfac670 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 10 May 2015 16:39:57 +0300 Subject: [PATCH 140/287] Expected test failure haskell/ghc-events#9 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 75dd99c2..8fb87fc0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1327,6 +1327,9 @@ expected-test-failures: # https://github.com/ekmett/machines/issues/44 - machines + # https://github.com/haskell/ghc-events/issues/9 + - ghc-events + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 9c38e5fcc5c995b4bb2cdfbb7f79d04ab3b5da03 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 10 May 2015 19:19:48 +0300 Subject: [PATCH 141/287] Expected test failure haskell-servent/servant#68 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8fb87fc0..381bb623 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1330,6 +1330,9 @@ expected-test-failures: # https://github.com/haskell/ghc-events/issues/9 - ghc-events + # https://github.com/haskell-servant/servant/issues/68 + - servant-client + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 7f927fb99c4ddaf3b2d9b78affba897c3cb25c47 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 10 May 2015 19:41:32 +0300 Subject: [PATCH 142/287] No more CURATOR_DIR --- automated/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 21abf2e5..98e882a8 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -11,7 +11,6 @@ BUNDLE_FILE=current.bundle CABAL_DIR=$ROOT/cabal GHC_DIR=$ROOT/ghc -CURATOR_DIR=$ROOT/stackage-curator DOT_STACKAGE_DIR=$ROOT/dot-stackage WORKDIR=$TROOT/work SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1) @@ -19,7 +18,6 @@ SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1) mkdir -p \ "$CABAL_DIR" \ "$GHC_DIR" \ - "$CURATOR_DIR" \ "$DOT_STACKAGE_DIR" \ "$WORKDIR" \ "$SSH_DIR" @@ -66,7 +64,7 @@ chmod +x stackage-curator ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro" ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage" ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro" -ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" +ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely 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" From 7d549937145d990ce03298f6634630f0de66e87e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 07:20:04 +0300 Subject: [PATCH 143/287] Add back wreq bos/wreq#61 --- build-constraints.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 381bb623..69723095 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -744,8 +744,7 @@ packages: - machines-io - machines-process # on behalf of Bryan O'Sullivan @bos - # https://github.com/bos/wreq/issues/61 - # - wreq GHC 7.10 + - wreq "Andraz Bajt andraz@bajt.me @edofic": - effect-handlers @@ -784,8 +783,8 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string - # - bitcoin-api GHC 7.10, via wreq - # - bitcoin-api-extra GHC 7.10, via wreq + - bitcoin-api + - bitcoin-api-extra - bitcoin-block - bitcoin-script - bitcoin-tx From 9c09182bd736165488583504e770cdce23d88653 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 07:20:17 +0300 Subject: [PATCH 144/287] S3 doc upload --- automated/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 98e882a8..815fc595 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -64,9 +64,9 @@ chmod +x stackage-curator ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro" ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage" ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro" -ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" +ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$AWS_SECRET_KEY -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely 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_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_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 --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 --target $TARGET && stackage-curator upload-docs --target $TARGET" From e168f0f0378be0fb317a5a762b1bdfa30125fbea Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 07:51:27 +0300 Subject: [PATCH 145/287] Account for nightly target name change --- automated/build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 815fc595..7e1b128c 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -5,7 +5,14 @@ set -eux ROOT=$(cd $(dirname $0) ; pwd) TARGET=$1 IMAGE=snoyberg/stackage:$(echo $TARGET | cut -d- -f 1) -TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1) + +if [ "$IMAGE" -eq "nightly"] +then + TROOT=$ROOT/nightly +else + TROOT=$ROOT/$(echo $TARGET | cut -d. -f 1) +fi + PLAN_FILE=current-plan.yaml BUNDLE_FILE=current.bundle From 7336f41ed2dd5bc322389d394b6005a9353d6529 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 08:33:18 +0300 Subject: [PATCH 146/287] Skip test for bttr/psqueues#2 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 69723095..80a892a4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1109,6 +1109,7 @@ skipped-tests: - testpack - vector - Cabal + - psqueues # 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. From b400ffa8bf5f9a873d6486412cf9511eba70c955 Mon Sep 17 00:00:00 2001 From: Chris Done Date: Mon, 11 May 2015 08:48:41 +0200 Subject: [PATCH 147/287] Add path package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 80a892a4..5a26b342 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -243,6 +243,7 @@ packages: - hindent - descriptive - wrap + - path # requires old haddock currently - haskell-docs # TODO: Add structured-haskell-mode once they've been ported to HSE 1.16. From ba330b4c05c5d7f144a8505537c8874681270088 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 10:33:26 +0300 Subject: [PATCH 148/287] Upper bound for #572 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5a26b342..04358f5c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -996,6 +996,9 @@ packages: # https://github.com/fpco/stackage/issues/568 - pandoc-citeproc < 0.7 + # https://github.com/fpco/stackage/issues/572 + - attoparsec < 0.13 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From bcf7000cd2f5b30109fdac85818bf99cb6e46035 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 10:37:01 +0300 Subject: [PATCH 149/287] Extra upper bound for #572 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 04358f5c..9cbfa303 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -998,6 +998,7 @@ packages: # https://github.com/fpco/stackage/issues/572 - attoparsec < 0.13 + - aeson < 0.8.1.0 # Package flags are applied to individual packages, and override the values of # global-flags From 4148ed9a297ca377346e9e3af09b359ad35c3b89 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Mon, 11 May 2015 10:36:55 +0100 Subject: [PATCH 150/287] Add psqueues to list of packages I maintain --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9cbfa303..67ca34c3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -182,6 +182,7 @@ packages: - blaze-markup - hakyll - stylish-haskell + - psqueues "Antoine Latter": - byteorder From fad4ca318a5aa16cd5a9e93256553fc0eb07e629 Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Mon, 11 May 2015 10:41:32 +0100 Subject: [PATCH 151/287] Add websockets to Stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9cbfa303..708e7d56 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -182,6 +182,7 @@ packages: - blaze-markup - hakyll - stylish-haskell + - websockets "Antoine Latter": - byteorder From 9fcbee26005e94d7b298d411091afc7b66e79166 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 11 May 2015 12:44:59 +0300 Subject: [PATCH 152/287] No more psqueues skipped tests --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 67ca34c3..13e5275c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1115,7 +1115,6 @@ skipped-tests: - testpack - vector - Cabal - - psqueues # 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. From e4977f4028f7edb8d335befb960dcedf525df0bd Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Mon, 11 May 2015 16:27:13 -0600 Subject: [PATCH 153/287] Adding the nested-routes library --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 390eacbc..e70a57df 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -972,6 +972,9 @@ packages: - clash-systemverilog - clash-ghc + "Athan Clark @athanclark": + - nested-routes + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From be6b09f7d258fcae70dc0900535266070e01c356 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 07:12:39 +0300 Subject: [PATCH 154/287] Upper bound for #576 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 390eacbc..c90b9607 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1002,6 +1002,9 @@ packages: - attoparsec < 0.13 - aeson < 0.8.1.0 + # https://github.com/fpco/stackage/issues/576 + - hscolour < 1.23 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From e91f30f067ed522e1d3bbf46a2b51ab7381d2cef Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 09:55:50 +0300 Subject: [PATCH 155/287] No more expected failure kazu-yamamoto/http-date#6 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c90b9607..532c95cb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1312,9 +1312,6 @@ expected-test-failures: # https://github.com/simonmar/alex/issues/62 GHC 7.10 - alex - # https://github.com/kazu-yamamoto/http-date/issues/6 GHC 7.10 - - http-date - # https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10 - haskell-names From 609b644989f7559da22e36cadeefff2879f7c6cf Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 09:57:44 +0300 Subject: [PATCH 156/287] Upper bounds for #577 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 532c95cb..7ecb0aa6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1005,6 +1005,9 @@ packages: # https://github.com/fpco/stackage/issues/576 - hscolour < 1.23 + # https://github.com/fpco/stackage/issues/577 + - MonadRandom < 0.4 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 521138a02624a6fbffc5d89e8e0146e46c993db7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 09:58:07 +0300 Subject: [PATCH 157/287] Remove upper bound and close #576 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7ecb0aa6..1c567064 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1002,9 +1002,6 @@ packages: - attoparsec < 0.13 - aeson < 0.8.1.0 - # https://github.com/fpco/stackage/issues/576 - - hscolour < 1.23 - # https://github.com/fpco/stackage/issues/577 - MonadRandom < 0.4 From 5947d30bcf68120713e44cf4d59af69a58ff2e8d Mon Sep 17 00:00:00 2001 From: Fumiaki Kinoshita Date: Tue, 12 May 2015 16:45:40 +0900 Subject: [PATCH 158/287] Add several packages I maintain --- build-constraints.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9b38e5a3..71ed7e2d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -957,13 +957,13 @@ packages: "Josh Holland josh@inv.alid.pw @jshholland": - sandi - data-ordlist - + "Harry Garrood @hdgarrood": - aeson-better-errors - + "Mitchell Rosen @christiaanb": - ghc-typelits-natnormalise - clash-prelude @@ -975,6 +975,13 @@ packages: "Athan Clark @athanclark": - nested-routes + "Fumiaki Kinoshita @fumieval": + - control-bool + - monad-skeleton + - objective + - witherable + - xml-lens + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From af68a28863dfc1f922e10c5c73c237fe5c9a2283 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 14:25:25 +0300 Subject: [PATCH 159/287] Upper bound for #579 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 71ed7e2d..f33c3b00 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1015,6 +1015,9 @@ packages: # https://github.com/fpco/stackage/issues/577 - MonadRandom < 0.4 + # https://github.com/fpco/stackage/issues/579 + - wai-app-static < 3.1 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 84a0aa9b0a44bb9c0c58735889cb07c7a226e24c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 15:05:16 +0300 Subject: [PATCH 160/287] Upper bounds for #579 #580 and #581 --- build-constraints.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f33c3b00..9c7e33f9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1017,6 +1017,14 @@ packages: # https://github.com/fpco/stackage/issues/579 - wai-app-static < 3.1 + - yesod-static < 1.5 + + # https://github.com/fpco/stackage/issues/580 + - chunked-data < 0.2 + + # https://github.com/fpco/stackage/issues/581 + - xml-conduit < 1.3 + - html-conduit < 1.2 # Package flags are applied to individual packages, and override the values of # global-flags From 455e136eaa2ca905e67f45b8d0f530085f9ae238 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 15:26:13 +0300 Subject: [PATCH 161/287] Remove upper bound and close #580 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9c7e33f9..fc5c9496 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1019,9 +1019,6 @@ packages: - wai-app-static < 3.1 - yesod-static < 1.5 - # https://github.com/fpco/stackage/issues/580 - - chunked-data < 0.2 - # https://github.com/fpco/stackage/issues/581 - xml-conduit < 1.3 - html-conduit < 1.2 From 3855d1d2f8b8c2720b20142e18f962932a412c02 Mon Sep 17 00:00:00 2001 From: Alois Cochard Date: Tue, 12 May 2015 14:36:19 +0200 Subject: [PATCH 162/287] Re-enable codex (#415). --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f33c3b00..4388f500 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -741,9 +741,8 @@ packages: - unbound-generics "Alois Cochard alois.cochard@gmail.com @aloiscochard": - # https://github.com/fpco/stackage/issues/415 - # - codex - #- machines-directory GHC 7.10 + - codex + - machines-directory - machines-io - machines-process # on behalf of Bryan O'Sullivan @bos From c815a1af1d41df941aecd08f5abc9cc9441c5ddb Mon Sep 17 00:00:00 2001 From: Alois Cochard Date: Tue, 12 May 2015 14:36:19 +0200 Subject: [PATCH 163/287] Re-enable codex (#415). --- build-constraints.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f33c3b00..4388f500 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -741,9 +741,8 @@ packages: - unbound-generics "Alois Cochard alois.cochard@gmail.com @aloiscochard": - # https://github.com/fpco/stackage/issues/415 - # - codex - #- machines-directory GHC 7.10 + - codex + - machines-directory - machines-io - machines-process # on behalf of Bryan O'Sullivan @bos From 79d4edd677693e4022dd5a881c767131afd25b0c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 18:37:16 +0300 Subject: [PATCH 164/287] Skip MissingH tests --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 72ababc5..7aee8a9e 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1136,6 +1136,7 @@ skipped-tests: - testpack - vector - Cabal + - MissingH # 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. From 24b55488b58a12525f8954bb82a580a9d18c099f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 12 May 2015 18:45:50 +0300 Subject: [PATCH 165/287] Remove upper bounds and close #568 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7aee8a9e..fa101ec8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1004,9 +1004,6 @@ packages: # https://github.com/fpco/stackage/issues/549 - tttool < 1.4 - # https://github.com/fpco/stackage/issues/568 - - pandoc-citeproc < 0.7 - # https://github.com/fpco/stackage/issues/572 - attoparsec < 0.13 - aeson < 0.8.1.0 From 1e1f0ef7777a02b43bdc480095162f1e0eef6743 Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Tue, 12 May 2015 18:15:19 -0600 Subject: [PATCH 166/287] more web packages --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fa101ec8..75b38e80 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -973,6 +973,9 @@ packages: "Athan Clark @athanclark": - nested-routes + - urlpath + - markup + - webpage "Fumiaki Kinoshita @fumieval": - control-bool From 8f83ffb1c80e84977803edcab0dbafb6c84c1907 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 06:21:16 +0300 Subject: [PATCH 167/287] Upper bounds for #586 --- build-constraints.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 75b38e80..ef44a4d3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1022,6 +1022,14 @@ packages: - xml-conduit < 1.3 - html-conduit < 1.2 + # https://github.com/fpco/stackage/issues/586 + - classy-prelude < 0.12 + - classy-prelude-conduit < 0.12 + - classy-prelude-yesod < 0.12 + - conduit-combinators < 1.0 + - basic-prelude < 0.4 + - chunked-data < 0.2 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 3f93ebaf4d8966368c58811104627e7f3da4906d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 08:19:22 +0300 Subject: [PATCH 168/287] Add stackage-metadata --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ef44a4d3..b918d2c8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -110,6 +110,7 @@ packages: - stackage-cabal - stackage-sandbox - stackage-setup + - stackage-metadata - statistics-linreg - th-expand-syns - thyme From 25fca6d6190c364674ed3f1a8a58868879899916 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 10:52:45 +0300 Subject: [PATCH 169/287] No longer expect failure bos/text#118 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index b918d2c8..1fcdace9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1342,9 +1342,6 @@ expected-test-failures: # https://github.com/haskell-suite/haskell-names/issues/63 GHC 7.10 - haskell-names - # https://github.com/bos/text/issues/118 GHC 7.10 - - text - # https://github.com/ekmett/hyperloglog/issues/10 GHC 7.10 - hyperloglog From fad55415e124dc3dd81326490be36cbe53269255 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 11:12:05 +0300 Subject: [PATCH 170/287] Fix working directory for nightly --- automated/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index 7e1b128c..7690be08 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -4,9 +4,10 @@ set -eux ROOT=$(cd $(dirname $0) ; pwd) TARGET=$1 -IMAGE=snoyberg/stackage:$(echo $TARGET | cut -d- -f 1) +TAG=$(echo $TARGET | cut -d- -f 1) +IMAGE=snoyberg/stackage:$TAG -if [ "$IMAGE" -eq "nightly"] +if [ "$TAG" -eq "nightly"] then TROOT=$ROOT/nightly else From 15cbe979846ce52cbaab9b5fb1ba5cd4fc450cba Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 11:15:34 +0300 Subject: [PATCH 171/287] Fix bash (I suck at this) --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 7690be08..dd876035 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -7,7 +7,7 @@ TARGET=$1 TAG=$(echo $TARGET | cut -d- -f 1) IMAGE=snoyberg/stackage:$TAG -if [ "$TAG" -eq "nightly"] +if [ "$TAG" = "nightly" ] then TROOT=$ROOT/nightly else From bf480cb3df4021c0cca5d324c8bf3e7cc9978ded Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 16:52:38 +0300 Subject: [PATCH 172/287] Upper bound for #587 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1fcdace9..52c905b8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1031,6 +1031,9 @@ packages: - basic-prelude < 0.4 - chunked-data < 0.2 + # https://github.com/fpco/stackage/issues/587 + - cabal-debian < 4.27.2 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 7aa25b3f329bd1e35f9cdea61cf72b4f0874e838 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 17:01:16 +0300 Subject: [PATCH 173/287] Temporarily block biophd BioHaskell/biophd#2 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 52c905b8..8d2d3b35 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -534,7 +534,8 @@ packages: # - biosff GHC 7.10 - blastxml - bioace - - biophd < 0.0.6 || > 0.0.6 + # https://github.com/BioHaskell/biophd/issues/2 + # - biophd < 0.0.6 || > 0.0.6 - biopsl # https://github.com/ingolia/SamTools/issues/3 samtools - seqloc - bioalign From cd7681628aeb868c7b249adecafd2e20e1e569ce Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 17:03:02 +0300 Subject: [PATCH 174/287] Expected test failure ekmett/parsers#47 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 8d2d3b35..f7a1ed73 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1367,6 +1367,9 @@ expected-test-failures: # https://github.com/haskell-servant/servant/issues/68 - servant-client + # https://github.com/ekmett/parsers/issues/47 + - parsers + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From ea089da9ab3ea635aa2ce94fc687679900f81ab7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 18:54:30 +0300 Subject: [PATCH 175/287] Expected test failure: bitcoin-api --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f7a1ed73..2b2a3f5f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1370,6 +1370,9 @@ expected-test-failures: # https://github.com/ekmett/parsers/issues/47 - parsers + # Requires a running server + - bitcoin-api + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 8764b2cff0fc66cab23feb67ca0535ee5b8d943c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 18:56:11 +0300 Subject: [PATCH 176/287] Temporarily block: solatis/haskell-bitcoin-api-extra#1 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2b2a3f5f..305e9363 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -788,7 +788,8 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string - bitcoin-api - - bitcoin-api-extra + # https://github.com/solatis/haskell-bitcoin-api-extra/issues/1 + # - bitcoin-api-extra - bitcoin-block - bitcoin-script - bitcoin-tx From b5c6cfcff27c116788ee430c343a0bd8feb8c854 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 19:12:07 +0300 Subject: [PATCH 177/287] --docmap-file added to automated builds --- automated/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index dd876035..617c7e88 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -15,6 +15,7 @@ else fi PLAN_FILE=current-plan.yaml +DOCMAP_FILE=current-docmap.yaml BUNDLE_FILE=current.bundle CABAL_DIR=$ROOT/cabal @@ -76,5 +77,5 @@ 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_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_BUILD $IMAGE stackage-curator make-bundle --plan-file $PLAN_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 --target $TARGET && stackage-curator upload-docs --target $TARGET" +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-docs --target $TARGET" From ea98e38f37cdccb257314a73a2955d31a3235786 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 19:17:15 +0300 Subject: [PATCH 178/287] --bundle-file for upload-docs --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 617c7e88..476e130b 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -78,4 +78,4 @@ 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_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_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-docs --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-docs --target $TARGET --bundle-file $BUNDLE_FILE" From f132923d7568c826a0ec3a32e45b23d27bf582d6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 13 May 2015 20:20:32 +0300 Subject: [PATCH 179/287] check-target-available --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 476e130b..a120d320 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -76,6 +76,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$AWS_SECRET_KEY -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely -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 "stackage-curator check-target-available --target $TARGET && 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_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-docs --target $TARGET --bundle-file $BUNDLE_FILE" From 8a024d79f2dfcccc631614eb72328c02f538f62a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:08:03 +0300 Subject: [PATCH 180/287] Switch bounds for #587 --- build-constraints.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 305e9363..819ff0d4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1034,7 +1034,7 @@ packages: - chunked-data < 0.2 # https://github.com/fpco/stackage/issues/587 - - cabal-debian < 4.27.2 + - newtype-generics < 0.4.0.1 # Package flags are applied to individual packages, and override the values of # global-flags @@ -1152,6 +1152,9 @@ skipped-tests: - Cabal - MissingH + # https://github.com/fpco/stackage/issues/587 + - newtype-generics + # 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: From 8839ff07d6afadd414dacab0e40490c534861b59 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:09:13 +0300 Subject: [PATCH 181/287] Remove upper bounds and close #586 --- build-constraints.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 819ff0d4..d8322a2c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1025,14 +1025,6 @@ packages: - xml-conduit < 1.3 - html-conduit < 1.2 - # https://github.com/fpco/stackage/issues/586 - - classy-prelude < 0.12 - - classy-prelude-conduit < 0.12 - - classy-prelude-yesod < 0.12 - - conduit-combinators < 1.0 - - basic-prelude < 0.4 - - chunked-data < 0.2 - # https://github.com/fpco/stackage/issues/587 - newtype-generics < 0.4.0.1 From d0f41632ddfb8b222a34a86698ef4356be346301 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:10:58 +0300 Subject: [PATCH 182/287] Upper bound for #588 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d8322a2c..2329e77b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1028,6 +1028,9 @@ packages: # https://github.com/fpco/stackage/issues/587 - newtype-generics < 0.4.0.1 + # https://github.com/fpco/stackage/issues/588 + - semigroupoids < 4.5 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From c068334feade75c9157105fbad84ea67998e9a2d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:24:04 +0300 Subject: [PATCH 183/287] Temporarily block two failing builds --- build-constraints.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2329e77b..534e2556 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -593,7 +593,8 @@ packages: # https://github.com/kazu-yamamoto/ghc-mod/issues/437 GHC 7.10 # - ghc-mod - io-choice - - system-canonicalpath + # https://github.com/d12frosted/CanonicalPath/issues/5 + # - system-canonicalpath "Yann Esposito ": - holy-project @@ -977,7 +978,8 @@ packages: "Athan Clark @athanclark": - nested-routes - urlpath - - markup + # https://github.com/athanclark/markup/issues/5 + # - markup - webpage "Fumiaki Kinoshita @fumieval": From 2b78553d09adea095b45bbe691484f85bedf3010 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:45:48 +0300 Subject: [PATCH 184/287] Unblock markup --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 534e2556..c07bdaf3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -978,8 +978,7 @@ packages: "Athan Clark @athanclark": - nested-routes - urlpath - # https://github.com/athanclark/markup/issues/5 - # - markup + - markup - webpage "Fumiaki Kinoshita @fumieval": From 48e698038ab65d754290c17fe87750c3aaf14e44 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:48:42 +0300 Subject: [PATCH 185/287] Temporary block for jwiegley/gitlib#46 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c07bdaf3..000fab76 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -640,7 +640,8 @@ packages: - haddock-api - here - hlibgit2 - - gitlib-libgit2 + # https://github.com/jwiegley/gitlib/issues/46 + # - gitlib-libgit2 - hostname-validate - interpolatedstring-perl6 - iproute From f137d8ea9293085815ca30e6daf74bc482ffec9e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 06:50:00 +0300 Subject: [PATCH 186/287] Block stackage-curator --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 000fab76..6a002855 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -100,7 +100,8 @@ packages: - shelly - smtLib - stackage - - stackage-curator + # Temporary block while system-filepath issues worked out + # - stackage-curator - stackage-types - stackage-update - stackage-upload From d0993c79914893b0e3ac8f5db062901307700895 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 08:27:49 +0300 Subject: [PATCH 187/287] Remove upper bounds and close #587 --- build-constraints.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6a002855..7ae3d9bf 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1028,9 +1028,6 @@ packages: - xml-conduit < 1.3 - html-conduit < 1.2 - # https://github.com/fpco/stackage/issues/587 - - newtype-generics < 0.4.0.1 - # https://github.com/fpco/stackage/issues/588 - semigroupoids < 4.5 @@ -1150,9 +1147,6 @@ skipped-tests: - Cabal - MissingH - # https://github.com/fpco/stackage/issues/587 - - newtype-generics - # 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: From fcfd3e11506c4c0a9980f60e3f7d04efac2077c8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 10:31:10 +0300 Subject: [PATCH 188/287] Unblock solatis/haskell-bitcoin-api-extra#1 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7ae3d9bf..d1571c52 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -791,8 +791,7 @@ packages: "Leon Mergen leon@solatis.com @solatis": - base58string - bitcoin-api - # https://github.com/solatis/haskell-bitcoin-api-extra/issues/1 - # - bitcoin-api-extra + - bitcoin-api-extra - bitcoin-block - bitcoin-script - bitcoin-tx From ac77ed2b5b512338508ce7df1312ffedf250424d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 12:02:06 +0300 Subject: [PATCH 189/287] Remove block for vincenthz/hs-libgit#4 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d1571c52..9937e709 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -215,8 +215,7 @@ packages: - crypto-random-api - hit - language-java - # https://github.com/vincenthz/hs-libgit/issues/4 - # - libgit GHC 7.10 + - libgit - pem - siphash - socks From 50dec036deb3751e59ed4d4b8ce5843f6cf271e9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 14 May 2015 13:00:06 +0300 Subject: [PATCH 190/287] Use upload-index --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index a120d320..610857ab 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -78,4 +78,4 @@ 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_PREBUILD $IMAGE /bin/bash -c "stackage-curator check-target-available --target $TARGET && 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_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-docs --target $TARGET --bundle-file $BUNDLE_FILE" +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" From a7bf4c7c7129c536f07ad1eb7b128d45de8c49db Mon Sep 17 00:00:00 2001 From: Peter Harpending Date: Thu, 14 May 2015 16:06:15 -0600 Subject: [PATCH 191/287] Add the package "exceptional" --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9937e709..def821b6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -988,6 +988,9 @@ packages: - witherable - xml-lens + "Peter Harpending @pharpend": + - exceptional + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From 70d95d6c36eb8e47fd712ebb318620cc6e5ccc52 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Thu, 14 May 2015 16:56:50 -0700 Subject: [PATCH 192/287] Add monad-extras --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9937e709..27720105 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -627,7 +627,7 @@ packages: "Luis G. Torres ": + "Emanuel Borsboom ": - BoundedChan - broadcast-chan - bytestring-lexing @@ -654,6 +654,7 @@ packages: - wl-pprint-text - Chart-cairo - ghc-events + - monad-extras "Michael Sloan ": - th-orphans From d8555885798c926b4eb5df387dce61405ec1d9cd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 05:28:27 +0300 Subject: [PATCH 193/287] Upper bound for #579 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 27720105..ed1f36c9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1022,6 +1022,7 @@ packages: # 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 From fc84810552a4c087935e20b5d26fea359e65b58d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 05:37:31 +0300 Subject: [PATCH 194/287] Run check-target-available under ARGS_UPLOAD --- automated/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 610857ab..deae040e 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -76,6 +76,7 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$AWS_SECRET_KEY -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely -docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "stackage-curator check-target-available --target $TARGET && 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_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_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" From 2e34ece59ab0ac8eae02c952c63afe3b9068fe84 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 07:07:35 +0300 Subject: [PATCH 195/287] Add back neat-interpolation --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 77391f9e..9715d32a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -669,7 +669,7 @@ packages: - hasql-postgres - list-t - mtl-prelude - #- neat-interpolation GHC 7.10 + - neat-interpolation - partial-handler - postgresql-binary - slave-thread From a8c4b0c02f144f7b948a0e163a92c365c8a76fbd Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 07:26:58 +0300 Subject: [PATCH 196/287] edit-distance --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9715d32a..86bef7cc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -815,7 +815,7 @@ packages: - string-conversions "Oleg Grenrus oleg.grenrus@iki.fi @phadej": - #- edit-distance GHC 7.10 + - edit-distance - lattices - waitra From 7dbd0297b7be9e1cee9f7a849eb1f7eaf57325d4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 10:11:01 +0300 Subject: [PATCH 197/287] Add expected test failure for running server needed --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 86bef7cc..bde2700a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1371,6 +1371,7 @@ expected-test-failures: # Requires a running server - bitcoin-api + - bitcoin-api-extra # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: From 882569c740b6c00a52046d748b3185296ecd3f64 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 13:01:01 +0300 Subject: [PATCH 198/287] Bind mount ~/.cabal during upload --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index deae040e..af54104a 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -73,7 +73,7 @@ chmod +x stackage-curator ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro" ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage" ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro" -ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$AWS_SECRET_KEY -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" +ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$AWS_SECRET_KEY -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro -v $CABAL_DIR:/home/stackage/.cabal:ro" # 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" From f300fa08e83786013897f06ce9d1142fb1f4e260 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 13:24:50 +0300 Subject: [PATCH 199/287] Upper bounds for #588 and #590 --- build-constraints.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bde2700a..1d4679d7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1033,6 +1033,11 @@ packages: # https://github.com/fpco/stackage/issues/588 - semigroupoids < 4.5 + - semigroupoid-extras < 4.5 + + # https://github.com/fpco/stackage/issues/590 + - bifunctors < 5 + - profunctors < 5 # Package flags are applied to individual packages, and override the values of # global-flags From 96d2c0b9bfa9bbdc0d8298407071aebdae5e2dc8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 13:39:43 +0300 Subject: [PATCH 200/287] Upper bound for #591 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1d4679d7..b9689289 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1039,6 +1039,9 @@ packages: - bifunctors < 5 - profunctors < 5 + # https://github.com/fpco/stackage/issues/591 + - th-orphans < 0.12 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 708425fcefe956ff2e0aa13c2ba57d99d60fc9d5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 15 May 2015 17:45:17 +0300 Subject: [PATCH 201/287] More upper bounds for #588 and #590 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b9689289..955213d0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1034,10 +1034,13 @@ packages: # https://github.com/fpco/stackage/issues/588 - semigroupoids < 4.5 - semigroupoid-extras < 4.5 + - lens < 4.10 # https://github.com/fpco/stackage/issues/590 - bifunctors < 5 - profunctors < 5 + - machines < 0.5 + - free < 4.12 # https://github.com/fpco/stackage/issues/591 - th-orphans < 0.12 From 32431f0da57e403052ff53d6cab42fedb1ba5623 Mon Sep 17 00:00:00 2001 From: Peter Harpending Date: Sat, 16 May 2015 12:53:30 -0600 Subject: [PATCH 202/287] Add 'pager' to stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 955213d0..8192f2c3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -991,6 +991,7 @@ packages: "Peter Harpending @pharpend": - exceptional + - pager "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 From f7eedd41d05727a80015176bf163b3bc66090eb4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sat, 16 May 2015 22:10:56 +0300 Subject: [PATCH 203/287] Upper bound for ekmett/lens-action#5 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 955213d0..15e6a31f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1045,6 +1045,9 @@ packages: # https://github.com/fpco/stackage/issues/591 - th-orphans < 0.12 + # https://github.com/ekmett/lens-action/issues/5 + - lens-action < 0.2 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 738aa0c4ed066988f62eced40107a85e98ecfa1f Mon Sep 17 00:00:00 2001 From: gbaz Date: Mon, 18 May 2015 00:30:50 -0400 Subject: [PATCH 204/287] jmacro fixed for 710 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7ab90a89..7d725fb7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -885,8 +885,7 @@ packages: - cabal-file-th "Gershom Bazerman @gbaz": - # http://hub.darcs.net/gershomb/jmacro/issue/1 GHC 7.10 - #- jmacro + - jmacro #- jmacro-rpc #- jmacro-rpc-happstack #- jmacro-rpc-snap From 38a06f49803c81ab41d96427a48d4cc6216fe60f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 18 May 2015 11:21:48 +0300 Subject: [PATCH 205/287] Add bad package noteed/language-glsl#11 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7d725fb7..9c068244 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -696,8 +696,7 @@ packages: #- elm-compiler - elm-core-sources #- elm-package - # https://github.com/noteed/language-glsl/issues/11 - #- language-glsl GHC 7.10 + - language-glsl - prettyclass - QuasiText - union-find From a7dfb5bccb3472d1b0b6ef4992c7d013c88c53d3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 18 May 2015 12:52:46 +0300 Subject: [PATCH 206/287] Add back pvdbrand/quandl-api#2 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9c068244..c923346b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -93,8 +93,7 @@ packages: - lhs2tex - persistent-mongoDB - pretty-class - # https://github.com/pvdbrand/quandl-api/issues/2 GHC 7.10 - #- quandl-api + - quandl-api - random-fu - random-source - shelly From e8defe55acea3c33144b4296cc3d6e2961cca3e4 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Mon, 18 May 2015 12:10:44 +0200 Subject: [PATCH 207/287] Add tasty-silver --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 955213d0..18b3a15c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -992,6 +992,9 @@ packages: "Peter Harpending @pharpend": - exceptional + "Philipp Hausmann @phile314": + - tasty-silver + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From e5970ae8b599097867ed1b84c3a16584c7c6c8dd Mon Sep 17 00:00:00 2001 From: Michael Thompson Date: Mon, 18 May 2015 10:19:43 -0400 Subject: [PATCH 208/287] Update build-constraints.yaml --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3da42d02..088e9121 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -993,6 +993,9 @@ packages: "Philipp Hausmann @phile314": - tasty-silver + "Michael Thompson @michaelt": + - pipes-text + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From 2e234b90cf37349da36140f60508c3d59b6d6cd3 Mon Sep 17 00:00:00 2001 From: gbaz Date: Mon, 18 May 2015 13:19:06 -0400 Subject: [PATCH 209/287] Update build-constraints.yaml --- build-constraints.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 7d725fb7..80a61003 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -886,9 +886,9 @@ packages: "Gershom Bazerman @gbaz": - jmacro - #- jmacro-rpc - #- jmacro-rpc-happstack - #- jmacro-rpc-snap + - jmacro-rpc + - jmacro-rpc-happstack + - jmacro-rpc-snap - mbox - kmeans - boolsimplifier From e575cf8fe6e1b1b4d5e187f40e9bd1d150aefc6e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 19 May 2015 07:35:54 +0300 Subject: [PATCH 210/287] Revert "Add bad package noteed/language-glsl#11" This reverts commit 38a06f49803c81ab41d96427a48d4cc6216fe60f. --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1473729f..f868d4c3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -695,7 +695,8 @@ packages: #- elm-compiler - elm-core-sources #- elm-package - - language-glsl + # https://github.com/noteed/language-glsl/issues/11 + #- language-glsl GHC 7.10 - prettyclass - QuasiText - union-find From 1b69a26bf704c0221713868332738bee7e7864d5 Mon Sep 17 00:00:00 2001 From: Justin Le Date: Tue, 19 May 2015 00:24:13 -0700 Subject: [PATCH 211/287] Update build-constraints.yaml --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index f868d4c3..50be5c7f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -996,6 +996,10 @@ packages: "Michael Thompson @michaelt": - pipes-text + + "Justin Le @mstksg": + - auto + - tagged-binary "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 From 056e0ecceb039af4cb025fb0a3d2fcde484630e5 Mon Sep 17 00:00:00 2001 From: Peter Harpending Date: Tue, 19 May 2015 11:04:38 -0600 Subject: [PATCH 212/287] Add editor-open to stackage --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 07286435..eb0062e3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -991,6 +991,7 @@ packages: - xml-lens "Peter Harpending @pharpend": + - editor-open - exceptional - pager From 8d104e9be6b0ecddc31a26fcf3654780eadec08f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 19 May 2015 21:20:29 +0300 Subject: [PATCH 213/287] language-glsl added *back* --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index eb0062e3..1bc337a2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -698,8 +698,7 @@ packages: #- elm-compiler - elm-core-sources #- elm-package - # https://github.com/noteed/language-glsl/issues/11 - #- language-glsl GHC 7.10 + - language-glsl - prettyclass - QuasiText - union-find From 1b46a985b34fe6aa4ad744837e874027130c410b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 20 May 2015 10:45:24 +0300 Subject: [PATCH 214/287] Install libxml2-dev (pinging @manny-fp) --- debian-bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 8064d9b3..16b21645 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -52,6 +52,7 @@ apt-get install -y \ libsdl2-dev \ libxss-dev \ libgtk-3-dev \ + libxml2-dev \ libzmq3-dev mkdir /tmp/nettle-build From ff47d340ce71ef1b2abd9752fdd3b550a2623a94 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Wed, 20 May 2015 12:08:45 +0200 Subject: [PATCH 215/287] Remove deprecated package --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1bc337a2..225d76a0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -562,7 +562,6 @@ packages: - imagesize-conduit - json-schema - multipart - - regular-xmlpickler - rest-client - rest-core - rest-gen From fde883edfccf33139a6bd1919e1f6f6b85d67f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Wed, 20 May 2015 18:25:23 +0800 Subject: [PATCH 216/287] add graph-wrapper --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 225d76a0..6fb19fc6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -812,6 +812,7 @@ packages: "Sönke Hahn soenkehahn@gmail.com @soenkehahn": - getopt-generics + - graph-wrapper - string-conversions "Oleg Grenrus oleg.grenrus@iki.fi @phadej": From ed86b5ce93b855d83afa0c84a84a5c46cb102b48 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 20 May 2015 15:19:42 +0300 Subject: [PATCH 217/287] Add libgsasl7-dev (pinging @manny-fp) --- debian-bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 16b21645..de24152e 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -53,6 +53,7 @@ apt-get install -y \ libxss-dev \ libgtk-3-dev \ libxml2-dev \ + libgsasl7-dev \ libzmq3-dev mkdir /tmp/nettle-build From 291eb1e02a8b397b39667b76364f9344f3134a2d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 20 May 2015 18:29:33 +0300 Subject: [PATCH 218/287] Extra upper bound for #572 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6fb19fc6..5fba5bf0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1030,6 +1030,7 @@ packages: # 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 From e83fbccc7770d37eb21ef4411c078b54be472e69 Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Wed, 20 May 2015 17:15:17 -0400 Subject: [PATCH 219/287] Add iand675 packages --- build-constraints.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5fba5bf0..a04c81e2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1004,6 +1004,19 @@ packages: - auto - tagged-binary + "Ian Duncan @iand675": + - datadog + - growler + - feature-flags + - flowdock + - growler + - engine-io-growler + - metrics + - pipes-wai + - serf + - uri-templater + - librato + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 From 6a5d78cfb6a7e99c72d5d439948abd8778a1a71e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 May 2015 06:42:06 +0300 Subject: [PATCH 220/287] Upper bound for #602 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5fba5bf0..69fb2ba7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1061,6 +1061,9 @@ packages: # https://github.com/ekmett/lens-action/issues/5 - lens-action < 0.2 + # https://github.com/fpco/stackage/issues/602 + - errors < 2 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 9f5318d71026bf413b964ac919d6ac7c2716386b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 May 2015 06:48:29 +0300 Subject: [PATCH 221/287] Temporarily block git-annex The only reason for this is that Docker Hub is having trouble creating a new image with the necessary libraries, which is stopping the build from succeeding. Will add back soon. --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 69fb2ba7..a9c30661 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -526,7 +526,8 @@ packages: #- hopenpgp-tools GHC 7.10, via syb-with-class "Joey Hess ": - - git-annex + [] + #- git-annex # https://github.com/fpco/stackage/issues/160 "Ketil Malde": From a5ee6149222f1ec94e7b30d7622ea79b132e6ed7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 21 May 2015 07:57:10 +0300 Subject: [PATCH 222/287] Revert "Temporarily block git-annex" This reverts commit 9f5318d71026bf413b964ac919d6ac7c2716386b. --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 297a03fe..3347bd15 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -526,8 +526,7 @@ packages: #- hopenpgp-tools GHC 7.10, via syb-with-class "Joey Hess ": - [] - #- git-annex + - git-annex # https://github.com/fpco/stackage/issues/160 "Ketil Malde": From ce594395337c3073c8983986455cf3920c9104d4 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 07:15:09 +0300 Subject: [PATCH 223/287] biophd and lens-action --- build-constraints.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3347bd15..e257e872 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -536,8 +536,7 @@ packages: # - biosff GHC 7.10 - blastxml - bioace - # https://github.com/BioHaskell/biophd/issues/2 - # - biophd < 0.0.6 || > 0.0.6 + - biophd - biopsl # https://github.com/ingolia/SamTools/issues/3 samtools - seqloc - bioalign @@ -1071,9 +1070,6 @@ packages: # https://github.com/fpco/stackage/issues/591 - th-orphans < 0.12 - # https://github.com/ekmett/lens-action/issues/5 - - lens-action < 0.2 - # https://github.com/fpco/stackage/issues/602 - errors < 2 From d456f72b1b6211e65a1ee84b0e30a4cc76487f94 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 08:44:16 +0300 Subject: [PATCH 224/287] Remove expected failure ekmett/semigroupoids#18 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e257e872..29f375ac 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1343,9 +1343,6 @@ expected-test-failures: # https://github.com/jberryman/directory-tree/issues/4 - directory-tree - # https://github.com/ekmett/semigroupoids/issues/18 - - semigroupoids - # https://github.com/ndmitchell/hoogle/issues/101 - hoogle From f9fd76a01d4ba747f432a33b03c80ea67c590f0e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 08:53:55 +0300 Subject: [PATCH 225/287] Add back package jwiegley/gitlib#46 --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 29f375ac..1c759279 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -640,8 +640,7 @@ packages: - haddock-api - here - hlibgit2 - # https://github.com/jwiegley/gitlib/issues/46 - # - gitlib-libgit2 + - gitlib-libgit2 - hostname-validate - interpolatedstring-perl6 - iproute From 27d372c572db5454d7ff268a068ec99ac5e995b8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 11:58:57 +0300 Subject: [PATCH 226/287] Block package BioHaskell/biophd#3 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 1c759279..87072a0f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -536,7 +536,8 @@ packages: # - biosff GHC 7.10 - blastxml - bioace - - biophd + # https://github.com/BioHaskell/biophd/issues/3 + # - biophd - biopsl # https://github.com/ingolia/SamTools/issues/3 samtools - seqloc - bioalign From b812dcaae2734ee6aa1973e25873a32ab6f2f9eb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 12:00:44 +0300 Subject: [PATCH 227/287] Temporary block amcphail/hmatrix-gsl-stats#6 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 87072a0f..0b6a7acb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -906,7 +906,8 @@ packages: - generics-sop "Vivian McPhail ": - - hmatrix-gsl-stats + # https://github.com/amcphail/hmatrix-gsl-stats/issues/6 + # - hmatrix-gsl-stats - hstatistics - hsignal - plot From e424ba94ec636dcca0d05c259705abfe424b7f15 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 12:01:48 +0300 Subject: [PATCH 228/287] Use upper bound instead --- build-constraints.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b6a7acb..e1bf81c7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -906,8 +906,7 @@ packages: - generics-sop "Vivian McPhail ": - # https://github.com/amcphail/hmatrix-gsl-stats/issues/6 - # - hmatrix-gsl-stats + - hmatrix-gsl-stats - hstatistics - hsignal - plot @@ -1074,6 +1073,9 @@ packages: # https://github.com/fpco/stackage/issues/602 - errors < 2 + # https://github.com/amcphail/hmatrix-gsl-stats/issues/6 + - hmatrix-gsl-stats < 0.3 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 88789f73cdafd4a56b91c112e993840acc5b30e7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 12:03:23 +0300 Subject: [PATCH 229/287] Expected test failure ekmett/semigroupids#34 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e1bf81c7..0394a028 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1412,6 +1412,9 @@ expected-test-failures: - bitcoin-api - bitcoin-api-extra + # https://github.com/ekmett/semigroupoids/issues/34 + - semigroupoids + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 751bc461ceeea5a2827aa5f7ff01e98af2664a68 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 14:49:38 +0300 Subject: [PATCH 230/287] Temporary block iand675/metrics#2 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0394a028..d7cb23bb 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1010,7 +1010,8 @@ packages: - flowdock - growler - engine-io-growler - - metrics + # https://github.com/iand675/metrics/issues/2 + # - metrics - pipes-wai - serf - uri-templater From abf0f4f00427f8d4a4d170f58bc6abd0328c3357 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 22 May 2015 14:53:17 +0300 Subject: [PATCH 231/287] Expected test failure kazu-yamamoto/dns#29 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index d7cb23bb..55ed1cb4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1416,6 +1416,9 @@ expected-test-failures: # https://github.com/ekmett/semigroupoids/issues/34 - semigroupoids + # https://github.com/kazu-yamamoto/dns/issues/29 + - dns + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From d458fb3f4ffb33459f48cdc0f7e91684c1119613 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Sun, 24 May 2015 08:17:35 +0100 Subject: [PATCH 232/287] remove udbus as I don't maintain it anymore --- build-constraints.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 55ed1cb4..b5226014 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -221,8 +221,6 @@ packages: - tls - tls-debug - vhd - # https://github.com/vincenthz/hs-udbus/issues/4 - # - udbus GHC 7.10 - xenstore "Chris Done": From 34578ed4fe3509241f0dcab6942d9cdaf1e701cb Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Sun, 24 May 2015 08:17:41 +0100 Subject: [PATCH 233/287] add memory --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b5226014..ced5a8ed 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -213,6 +213,7 @@ packages: - crypto-pubkey-types - crypto-random-api - hit + - memory - language-java - libgit - pem From 3c6e41e4d992bb2993d1d90a5ff1d84051410879 Mon Sep 17 00:00:00 2001 From: Vincent Hanquez Date: Sun, 24 May 2015 08:17:48 +0100 Subject: [PATCH 234/287] add cryptonite --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ced5a8ed..e8afb1b8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -210,6 +210,7 @@ packages: - cpu - cryptocipher - cryptohash + - cryptonite - crypto-pubkey-types - crypto-random-api - hit From a7c836e42a1404e502672a02b60b917f89f28cfc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 May 2015 09:51:30 +0300 Subject: [PATCH 235/287] Upper bound for kawu/text-binary#1 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index e8afb1b8..faa831df 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1077,6 +1077,9 @@ packages: # https://github.com/amcphail/hmatrix-gsl-stats/issues/6 - hmatrix-gsl-stats < 0.3 + # https://github.com/kawu/text-binary/pull/1 + - text < 1.2.1 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 91780e63d574119b070a7d9ce0afb3d8ed125ffc Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 May 2015 10:02:38 +0300 Subject: [PATCH 236/287] Remove upper bound for amcphail/hmatrix-gsl-stats#6 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index faa831df..17ee68e7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1074,9 +1074,6 @@ packages: # https://github.com/fpco/stackage/issues/602 - errors < 2 - # https://github.com/amcphail/hmatrix-gsl-stats/issues/6 - - hmatrix-gsl-stats < 0.3 - # https://github.com/kawu/text-binary/pull/1 - text < 1.2.1 From bf27286d58586bbd8bede17f4e1c31b8ae03c49d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 May 2015 13:05:19 +0300 Subject: [PATCH 237/287] Upper bound for #604 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 17ee68e7..cf96c182 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1077,6 +1077,9 @@ packages: # https://github.com/kawu/text-binary/pull/1 - text < 1.2.1 + # https://github.com/fpco/stackage/issues/604 + - Rasterific < 0.6 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 092bf817040da82a1e8aa55a34ee83380679715a Mon Sep 17 00:00:00 2001 From: Vincent Date: Mon, 25 May 2015 12:55:30 +0200 Subject: [PATCH 238/287] Add asciidiagram to build-constraints.yaml --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index cf96c182..ffbc7ed3 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -377,6 +377,7 @@ packages: - Rasterific - svg-tree - rasterific-svg + - asciidiagram "Patrick Brisbin": - gravatar From 772bac4bd2f718e576fba1b8466cb93aa41cfbed Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 May 2015 14:21:46 +0300 Subject: [PATCH 239/287] Extra upper bound for #604 --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index ffbc7ed3..fb417a4a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1080,6 +1080,7 @@ packages: # https://github.com/fpco/stackage/issues/604 - Rasterific < 0.6 + - rasterific-svg < 0.2.3 # Package flags are applied to individual packages, and override the values of # global-flags From 5d2a4088ce2788ce62c7b3d5dd566d2ed02738b0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 May 2015 14:43:58 +0300 Subject: [PATCH 240/287] Temporarily block asciidiagram #605 --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fb417a4a..f17945a9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -377,7 +377,8 @@ packages: - Rasterific - svg-tree - rasterific-svg - - asciidiagram + # https://github.com/fpco/stackage/pull/605 + # - asciidiagram "Patrick Brisbin": - gravatar From 5600e41deca4a04d9da1e4a35b836089a3685bb1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 25 May 2015 17:48:13 +0300 Subject: [PATCH 241/287] Remove upper bounds and close #604 --- build-constraints.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f17945a9..2e08b552 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -377,8 +377,7 @@ packages: - Rasterific - svg-tree - rasterific-svg - # https://github.com/fpco/stackage/pull/605 - # - asciidiagram + - asciidiagram "Patrick Brisbin": - gravatar @@ -781,7 +780,8 @@ packages: "Jeffrey Rosenbluth jeffrey.rosenbluth@gmail.com": - palette #- diagrams-canvas GHC 7.10, via blank-canvas - - diagrams-rasterific + # https://github.com/diagrams/diagrams-rasterific/pull/30 + # - diagrams-rasterific - lucid-svg - diagrams-html5 - static-canvas @@ -1079,10 +1079,6 @@ packages: # https://github.com/kawu/text-binary/pull/1 - text < 1.2.1 - # https://github.com/fpco/stackage/issues/604 - - Rasterific < 0.6 - - rasterific-svg < 0.2.3 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 2edc877c0884758ff55e1fdde54fe1928301a374 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 26 May 2015 10:38:10 +0300 Subject: [PATCH 242/287] Add back diagrams-rasterific --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 2e08b552..dd6cf3fc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -780,8 +780,7 @@ packages: "Jeffrey Rosenbluth jeffrey.rosenbluth@gmail.com": - palette #- diagrams-canvas GHC 7.10, via blank-canvas - # https://github.com/diagrams/diagrams-rasterific/pull/30 - # - diagrams-rasterific + - diagrams-rasterific - lucid-svg - diagrams-html5 - static-canvas From 125012a7ace3b6aac90a0b155cac8f3aac0f6250 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 26 May 2015 14:51:21 +0300 Subject: [PATCH 243/287] Remove expected test failure haskell-servant/servant#68 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dd6cf3fc..4cc2226b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1404,9 +1404,6 @@ expected-test-failures: # https://github.com/haskell/ghc-events/issues/9 - ghc-events - # https://github.com/haskell-servant/servant/issues/68 - - servant-client - # https://github.com/ekmett/parsers/issues/47 - parsers From 42bc862d31d367bcb5b02ed5f20320b63bb8e347 Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Wed, 27 May 2015 10:44:49 +0700 Subject: [PATCH 244/287] Adds base32string --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4cc2226b..7232eef9 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -789,6 +789,7 @@ packages: - sdl2 "Leon Mergen leon@solatis.com @solatis": + - base32string - base58string - bitcoin-api - bitcoin-api-extra From 629120934f55957ba32ea79e4e81410fc00f39e1 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 27 May 2015 07:00:31 +0300 Subject: [PATCH 245/287] Some expected test failures haskell-servent/servant#98 chrisdone/hindent#137 --- build-constraints.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4cc2226b..68070245 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1417,6 +1417,12 @@ expected-test-failures: # https://github.com/kazu-yamamoto/dns/issues/29 - dns + # https://github.com/haskell-servant/servant/issues/98 + - servant-client + + # https://github.com/chrisdone/hindent/issues/137 + - hindent + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 392f735a67814d0ec640151da32dcb01210a4cc6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 27 May 2015 07:40:11 +0300 Subject: [PATCH 246/287] Don't use system libraries (causes trouble for Windows) --- build-constraints.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index e33625ee..f472725f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1085,12 +1085,6 @@ package-flags: mersenne-random-pure64: small_base: false - # Use system libraries to speed up compilation and get bug fixes - persistent-sqlite: - systemlib: true - yaml: - system-libyaml: true - cloud-haskell: tcp: true simplelocalnet: true From dd1a039f8d7516b289718fe18ca991aaafaff649 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 27 May 2015 12:31:01 +0300 Subject: [PATCH 247/287] Remove expected failure and close chrisdone/hindent#137 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f472725f..a7376c7a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1415,9 +1415,6 @@ expected-test-failures: # https://github.com/haskell-servant/servant/issues/98 - servant-client - # https://github.com/chrisdone/hindent/issues/137 - - hindent - # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 5a905f4ed8ee52c1a5b3ac9e1dd2efd04c6acf56 Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Wed, 27 May 2015 14:00:15 -0700 Subject: [PATCH 248/287] + Dan Burton: hspec-jenkins --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a7376c7a..c8c309ef 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -400,6 +400,7 @@ packages: - accelerate "Dan Burton ": + - hspec-jenkins - yesod-gitrev - basic-prelude - composition From 4d56c1245f68bd1a80191a5af6b1753306d59c19 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 28 May 2015 17:02:12 +0300 Subject: [PATCH 249/287] Allow text 1.2.1, block pandoc 1.4 (#607) --- build-constraints.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8c309ef..042da9f7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1077,8 +1077,8 @@ packages: # https://github.com/fpco/stackage/issues/602 - errors < 2 - # https://github.com/kawu/text-binary/pull/1 - - text < 1.2.1 + # https://github.com/fpco/stackage/issues/607 + - pandoc < 1.14 # Package flags are applied to individual packages, and override the values of # global-flags From 62869c2eec159b67500141c77693cc81a438f424 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 28 May 2015 18:49:07 +0300 Subject: [PATCH 250/287] Group highlighting-kate with #607 --- build-constraints.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 042da9f7..574962ca 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1024,9 +1024,6 @@ packages: # https://github.com/fpco/stackage/issues/476 - vector-space < 0.10 - # https://github.com/jgm/pandoc/issues/2036 - - highlighting-kate < 0.5.13 - # https://github.com/fpco/stackage/issues/509 - srcloc < 0.5 @@ -1079,6 +1076,7 @@ packages: # https://github.com/fpco/stackage/issues/607 - pandoc < 1.14 + - highlighting-kate < 0.5.13 # Package flags are applied to individual packages, and override the values of # global-flags From 6e695771dab3b593ee587089ff2985c8de931c5b Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Thu, 28 May 2015 18:56:07 -0600 Subject: [PATCH 251/287] some "useful" combinators --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 574962ca..55a6a6c8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -983,6 +983,7 @@ packages: - urlpath - markup - webpage + - composition-extra "Fumiaki Kinoshita @fumieval": - control-bool From a197fdc56570700bf94958f45dc51a9d9d1fb872 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 06:01:47 +0300 Subject: [PATCH 252/287] One more #607 upper bound --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 55a6a6c8..9987f13f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1078,6 +1078,7 @@ packages: # https://github.com/fpco/stackage/issues/607 - pandoc < 1.14 - highlighting-kate < 0.5.13 + - BlogLiterately < 0.8 # Package flags are applied to individual packages, and override the values of # global-flags From 20286bfb99d725fbcd41cb726da0939d8ffb43f6 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 08:16:11 +0300 Subject: [PATCH 253/287] Remove upper bounds and close #476 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9987f13f..f379cc9a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1022,9 +1022,6 @@ packages: - librato "Stackage upper bounds": - # https://github.com/fpco/stackage/issues/476 - - vector-space < 0.10 - # https://github.com/fpco/stackage/issues/509 - srcloc < 0.5 From 45d8c8f3e5158b76fe4c691d94abc77920df1e14 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 08:18:13 +0300 Subject: [PATCH 254/287] Remove upper bounds and close #515 --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index f379cc9a..4b7ae381 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1025,10 +1025,6 @@ packages: # 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 From ecce5c5080db5cd1ea2f07d1265411fcc364fbb3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 08:25:29 +0300 Subject: [PATCH 255/287] Temporary block on language-c-quote until srclog dep is fixed --- build-constraints.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b7ae381..4b7cb1e7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -810,7 +810,11 @@ packages: - pcre-heavy "Francesco Mazzoli f@mazzo.li @bitonic": - - language-c-quote + [] + # Temporarily blocked due to: + # https://github.com/fpco/stackage/issues/509 + # - language-c-quote + "Sönke Hahn soenkehahn@gmail.com @soenkehahn": - getopt-generics @@ -1022,9 +1026,6 @@ packages: - librato "Stackage upper bounds": - # https://github.com/fpco/stackage/issues/509 - - srcloc < 0.5 - # https://github.com/fpco/stackage/issues/517 - generic-deriving < 1.7 From 9b627ffe6671b01777a393d4b2bad807c93b5a00 Mon Sep 17 00:00:00 2001 From: Roman Cheplyaka Date: Fri, 29 May 2015 08:34:21 +0300 Subject: [PATCH 256/287] Add lexer-applicative, tuples-homogenous-h98 --- build-constraints.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4b7cb1e7..4c219509 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -484,6 +484,7 @@ packages: - hse-cpp - immortal - regex-applicative + - lexer-applicative - smallcheck - tasty - tasty-golden @@ -494,6 +495,7 @@ packages: - timezone-olson - timezone-series - traverse-with-class + - tuples-homogenous-h98 "George Giorgidze ": - HCodecs From 809bf86930e2ac9a1a25a02c211ecfc7d3c3a8de Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 09:06:07 +0300 Subject: [PATCH 257/287] Remove upper bounds and close #517 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4c219509..6d1c491a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1028,9 +1028,6 @@ packages: - librato "Stackage upper bounds": - # https://github.com/fpco/stackage/issues/517 - - generic-deriving < 1.7 - # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 From c22bde55a86164d8d531785453555ee9bc759b06 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 14:44:52 +0300 Subject: [PATCH 258/287] Remove upper bounds and close #607 --- build-constraints.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6d1c491a..c262ee49 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1068,11 +1068,6 @@ packages: # https://github.com/fpco/stackage/issues/602 - errors < 2 - # https://github.com/fpco/stackage/issues/607 - - pandoc < 1.14 - - highlighting-kate < 0.5.13 - - BlogLiterately < 0.8 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 778eab1edb003ba46e0d1dcef5f3d04278e4a700 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 29 May 2015 14:45:44 +0300 Subject: [PATCH 259/287] Upper bound for #610 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index c262ee49..157b1f4d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1068,6 +1068,9 @@ packages: # https://github.com/fpco/stackage/issues/602 - errors < 2 + # https://github.com/fpco/stackage/issues/610 + - either < 4.4 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 1b30030bf814daf0019884e416d76e57a7c6e968 Mon Sep 17 00:00:00 2001 From: Ian Duncan Date: Sat, 30 May 2015 11:12:09 -0400 Subject: [PATCH 260/287] Reenable metrics package --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 157b1f4d..e9a40a35 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1020,8 +1020,7 @@ packages: - flowdock - growler - engine-io-growler - # https://github.com/iand675/metrics/issues/2 - # - metrics + - metrics - pipes-wai - serf - uri-templater From 1452f61b6c955d50c0c452f5183f440845ab3db0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 07:18:17 +0300 Subject: [PATCH 261/287] Upper bound for #613 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 157b1f4d..db7c992f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1071,6 +1071,9 @@ packages: # https://github.com/fpco/stackage/issues/610 - either < 4.4 + # https://github.com/fpco/stackage/issues/613 + - hslua < 0.4 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 87152d0f0fca63171dc8f7378586d2cd366c53d8 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 09:01:46 +0300 Subject: [PATCH 262/287] Remove upper bounds and close #579 --- build-constraints.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 844db322..76070091 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1041,11 +1041,6 @@ packages: # 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 From 7cfc0bc978c79ee55cea788ef13ecb37eae80343 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 09:02:16 +0300 Subject: [PATCH 263/287] Remove expected failure haskell-servent/servent#98 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 76070091..dea40cc2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1401,9 +1401,6 @@ expected-test-failures: # https://github.com/kazu-yamamoto/dns/issues/29 - dns - # https://github.com/haskell-servant/servant/issues/98 - - servant-client - # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 62ff92d3aa25e50aa08e112ca41cc8528eb205d0 Mon Sep 17 00:00:00 2001 From: Leon Mergen Date: Sun, 31 May 2015 15:47:11 +0700 Subject: [PATCH 264/287] Adds network-anonymous-tor --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index dea40cc2..6e243d7f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -803,6 +803,7 @@ packages: - hexstring - network-attoparsec - network-anonymous-i2p + - network-anonymous-tor "Timothy Jones git@zmthy.io @zmthy": - http-media From 2e4d1da4ff104e18c9bc6080ec6175f86a949183 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 13:51:43 +0300 Subject: [PATCH 265/287] Skip cmark benchmarks --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 6e243d7f..fb9bb2c1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1452,6 +1452,9 @@ skipped-benchmarks: - postgresql-binary - scientific + # Pulls in discount which depends on extra C libraries + - cmark + skipped-profiling: # https://github.com/nomeata/ghc-heap-view/commit/8d198eb8fbbad2ce0c4527c781659f35b8909c04#diff-8288955e209cfbead5b318a8598be9c0R10 - ghc-heap-view From e522575d674b6e3cd0c86721aedcab6c83858f6f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 13:53:20 +0300 Subject: [PATCH 266/287] Expected haddock failure solatis/haskell-network-anonymous-tor#1 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index fb9bb2c1..b62dd3f8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1421,6 +1421,9 @@ expected-haddock-failures: # Not sure why, but it's a temporary package anyway - Cabal-ide-backend + # https://github.com/solatis/haskell-network-anonymous-tor/issues/1 + - network-anonymous-tor + # Benchmarks which should not be built. Note that Stackage does *not* generally # build benchmarks. The difference here will be whether dependencies for these # benchmarks are included or not. From 6c2ee116a47ea32dfa19519493f42d04ae9b1e7c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 13:54:53 +0300 Subject: [PATCH 267/287] Expected test failure iand675/metrics#3 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b62dd3f8..bc142365 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1402,6 +1402,9 @@ expected-test-failures: # https://github.com/kazu-yamamoto/dns/issues/29 - dns + # https://github.com/iand675/metrics/issues/3 + - metrics + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 8d99e7707d680d2672cd875b48552b647050dd13 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 14:04:11 +0300 Subject: [PATCH 268/287] Expect cipher-aes test failure --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index bc142365..9667c3e6 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1405,6 +1405,10 @@ expected-test-failures: # https://github.com/iand675/metrics/issues/3 - metrics + # Getting no useful information as to why from the build server, but works + # when tested locally + - cipher-aes + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From efb92cc3a2cbbec07df21dca9c96f29525634270 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 19:10:00 +0300 Subject: [PATCH 269/287] Remove upper bounds and close #613 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 9667c3e6..578603be 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1066,9 +1066,6 @@ packages: # https://github.com/fpco/stackage/issues/610 - either < 4.4 - # https://github.com/fpco/stackage/issues/613 - - hslua < 0.4 - # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From e64c6dc6af604fd2f0a963676876b29becbbb696 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 31 May 2015 19:22:05 +0300 Subject: [PATCH 270/287] Upper bound for #615 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 578603be..04971712 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1066,6 +1066,9 @@ packages: # https://github.com/fpco/stackage/issues/610 - either < 4.4 + # https://github.com/fpco/stackage/issues/615 + - syb < 0.5 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 15d64ba6a76f94f2663615e0cbeaeb7e911e72c0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 1 Jun 2015 08:42:04 +0300 Subject: [PATCH 271/287] Remove expected Haddock failure and close solatis/haskell-network-anonymous-tor#1 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 04971712..4fa39a21 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1428,9 +1428,6 @@ expected-haddock-failures: # Not sure why, but it's a temporary package anyway - Cabal-ide-backend - # https://github.com/solatis/haskell-network-anonymous-tor/issues/1 - - network-anonymous-tor - # Benchmarks which should not be built. Note that Stackage does *not* generally # build benchmarks. The difference here will be whether dependencies for these # benchmarks are included or not. From fc202c2e6aa778c164594bb2a19d0be48c5f0ce5 Mon Sep 17 00:00:00 2001 From: "Michal J. Gajda" Date: Tue, 2 Jun 2015 01:17:18 +0800 Subject: [PATCH 272/287] Added posix-realtime due to user interest. --- build-constraints.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4fa39a21..cf379a21 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -460,7 +460,7 @@ packages: "Janne Hellsten ": - sqlite-simple - "Michal J. Gajda": + "Michal J. Gajda ": - iterable - Octree - FenwickTree @@ -469,6 +469,7 @@ packages: - wordpass - json-autotype + - posix-realtime "Dominic Steinitz ": [] From b55647cfcfc00aebdb75569c8a707392ddec4a3f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 06:18:08 +0300 Subject: [PATCH 273/287] Expect test failure bergmark/feed#3 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4fa39a21..07d717e1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1409,6 +1409,9 @@ expected-test-failures: # when tested locally - cipher-aes + # https://github.com/bergmark/feed/issues/3 + - feed + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From 013b84fc34f8b68003d1cf216ef141f8d88774b0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 06:27:10 +0300 Subject: [PATCH 274/287] Expect test failure afcowie/http-streams#80 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 07d717e1..dfb1f920 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1412,6 +1412,9 @@ expected-test-failures: # https://github.com/bergmark/feed/issues/3 - feed + # https://github.com/afcowie/http-streams/issues/80 + - http-streams + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4 From dc9e340326e609302ac0f37b0446805f2da79528 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 06:44:38 +0300 Subject: [PATCH 275/287] New stackage-server, no longer upload there --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index af54104a..902e62f4 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -79,4 +79,4 @@ ARGS_UPLOAD="$ARGS_COMMON -e AWS_ACCESS_KEY=$AWS_ACCESS_KEY -e AWS_SECRET_KEY=$A 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_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" From 624fa471e3c7651b322f23a47d65c5e75f043e37 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 06:46:13 +0300 Subject: [PATCH 276/287] Add back BlogLiterately-diagrams --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index dfb1f920..cb774bd4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -352,7 +352,7 @@ packages: "Brent Yorgey ": - active - BlogLiterately - # - BlogLiterately-diagrams GHC 7.10 + - BlogLiterately-diagrams - diagrams # https://github.com/fpco/stackage/issues/443 From e73128393e776a5c16c81c46e3b0276f61f2593d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 09:30:18 +0300 Subject: [PATCH 277/287] Expect test success bergmark/feed#3 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index cb774bd4..233ef756 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1409,9 +1409,6 @@ expected-test-failures: # when tested locally - cipher-aes - # https://github.com/bergmark/feed/issues/3 - - feed - # https://github.com/afcowie/http-streams/issues/80 - http-streams From 9dfe350eeadf5091f3bcaebad685450dc00c6739 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 10:33:16 +0300 Subject: [PATCH 278/287] Add back language-c-quote without tests and close #509 --- build-constraints.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 233ef756..74acaff8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -813,11 +813,7 @@ packages: - pcre-heavy "Francesco Mazzoli f@mazzo.li @bitonic": - [] - # Temporarily blocked due to: - # https://github.com/fpco/stackage/issues/509 - # - language-c-quote - + - language-c-quote "Sönke Hahn soenkehahn@gmail.com @soenkehahn": - getopt-generics @@ -1179,6 +1175,9 @@ skipped-tests: - Cabal - MissingH + # Upper bound on src-log, see: https://github.com/fpco/stackage/issues/509 + - language-c-quote + # 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: From a95cb0244eaf2726005616dda665bf33d11fd41c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 13:37:28 +0300 Subject: [PATCH 279/287] Add explicit mime-mail --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 74acaff8..711cf73c 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 From 76f1bf1543e669079b467ed174c5ef22de297c3d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 2 Jun 2015 14:09:00 +0300 Subject: [PATCH 280/287] Upper bound for #616 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 711cf73c..14b5d997 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1066,6 +1066,9 @@ packages: # https://github.com/fpco/stackage/issues/615 - syb < 0.5 + # https://github.com/fpco/stackage/issues/616 + - string-conversions < 0.4 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From dd22f5d4660ba960ac9827d5b3388c8bfd3f909a Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 3 Jun 2015 06:50:56 +0300 Subject: [PATCH 281/287] Upper bounds for #617 --- build-constraints.yaml | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 14b5d997..d910d207 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1069,6 +1069,56 @@ packages: # https://github.com/fpco/stackage/issues/616 - string-conversions < 0.4 + # https://github.com/fpco/stackage/issues/617 + - amazonka < 0.3.5 + - amazonka-core < 0.3.5 + - amazonka-autoscaling < 0.3.5 + - amazonka-cloudformation < 0.3.5 + - amazonka-cloudfront < 0.3.5 + - amazonka-cloudhsm < 0.3.5 + - amazonka-cloudsearch-domains < 0.3.5 + - amazonka-cloudsearch < 0.3.5 + - amazonka-cloudtrail < 0.3.5 + - amazonka-cloudwatch-logs < 0.3.5 + - amazonka-cloudwatch < 0.3.5 + - amazonka-codedeploy < 0.3.5 + - amazonka-cognito-identity < 0.3.5 + - amazonka-cognito-sync < 0.3.5 + - amazonka-config < 0.3.5 + - amazonka-datapipeline < 0.3.5 + - amazonka-directconnect < 0.3.5 + - amazonka-dynamodb < 0.3.5 + - amazonka-ec2 < 0.3.5 + - amazonka-ecs < 0.3.5 + - amazonka-elasticache < 0.3.5 + - amazonka-elasticbeanstalk < 0.3.5 + - amazonka-elastictranscoder < 0.3.5 + - amazonka-elb < 0.3.5 + - amazonka-emr < 0.3.5 + - amazonka-glacier < 0.3.5 + - amazonka-iam < 0.3.5 + - amazonka-importexport < 0.3.5 + - amazonka-kinesis < 0.3.5 + - amazonka-kms < 0.3.5 + - amazonka-lambda < 0.3.5 + - amazonka-ml < 0.3.5 + - amazonka-opsworks < 0.3.5 + - amazonka-rds < 0.3.5 + - amazonka-redshift < 0.3.5 + - amazonka-route53-domains < 0.3.5 + - amazonka-route53 < 0.3.5 + - amazonka-s3 < 0.3.5 + - amazonka-sdb < 0.3.5 + - amazonka-ses < 0.3.5 + - amazonka-sns < 0.3.5 + - amazonka-sqs < 0.3.5 + - amazonka-ssm < 0.3.5 + - amazonka-storagegateway < 0.3.5 + - amazonka-sts < 0.3.5 + - amazonka-support < 0.3.5 + - amazonka-swf < 0.3.5 + - amazonka-workspaces < 0.3.5 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 20ba31d84d05c7ce3185c6f4a73b7d760c6af99f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 3 Jun 2015 10:47:09 +0300 Subject: [PATCH 282/287] Don't expect test failure iand675/metrics#3 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index d910d207..3bc43c39 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1455,9 +1455,6 @@ expected-test-failures: # https://github.com/kazu-yamamoto/dns/issues/29 - dns - # https://github.com/iand675/metrics/issues/3 - - metrics - # Getting no useful information as to why from the build server, but works # when tested locally - cipher-aes From 445195fcab831e99c1b586da6c0797ac97959211 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 3 Jun 2015 11:10:23 +0300 Subject: [PATCH 283/287] Expect cipher-aes test to pass --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 3bc43c39..3896830f 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1455,10 +1455,6 @@ expected-test-failures: # https://github.com/kazu-yamamoto/dns/issues/29 - dns - # Getting no useful information as to why from the build server, but works - # when tested locally - - cipher-aes - # https://github.com/afcowie/http-streams/issues/80 - http-streams From ca76f90440eb9eaaf0697714a505e7a9f97ed97b Mon Sep 17 00:00:00 2001 From: Christiaan Baaij Date: Wed, 3 Jun 2015 18:04:39 +0200 Subject: [PATCH 284/287] Add ghc-tcplugins-extra package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 84748b4b..84aede96 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -976,6 +976,7 @@ packages: - tasty-hspec "Christiaan Baaij @christiaanb": + - ghc-tcplugins-extra - ghc-typelits-natnormalise - clash-prelude - clash-lib From b6baf5136295a53684ccca916c72f58a3f4438b3 Mon Sep 17 00:00:00 2001 From: Christiaan Baaij Date: Wed, 3 Jun 2015 20:02:18 +0200 Subject: [PATCH 285/287] Add the `clash-verilog` package --- build-constraints.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 84aede96..78b5154a 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -981,6 +981,7 @@ packages: - clash-prelude - clash-lib - clash-vhdl + - clash-verilog - clash-systemverilog - clash-ghc From bf2dc54ff73f9ccdbe0c37fa00104b23211ed5c3 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 4 Jun 2015 09:54:16 +0300 Subject: [PATCH 286/287] Upper bound for #622 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 84aede96..320fbde4 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1121,6 +1121,9 @@ packages: - amazonka-swf < 0.3.5 - amazonka-workspaces < 0.3.5 + # https://github.com/fpco/stackage/issues/622 + - doctest < 0.10 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: From 21eb168b10ab0407fc31a35aeaeffb539e70bb3f Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 4 Jun 2015 09:56:26 +0300 Subject: [PATCH 287/287] Disallow comonad 4.2.7 --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 320fbde4..0b31b255 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -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