From 5d89b118d62142263f7a7b22caeaa129c5b8f9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Mon, 7 Sep 2015 09:20:46 +0200 Subject: [PATCH 01/11] ghc-mod works with GHC 7.10 now --- build-constraints.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index fa6f77af..a95052c0 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -639,12 +639,14 @@ packages: - ghc-syb-utils "Boris Buliga ": - # https://github.com/kazu-yamamoto/ghc-mod/issues/437 GHC 7.10 - # - ghc-mod - io-choice # https://github.com/d12frosted/CanonicalPath/issues/5 # - system-canonicalpath + "Daniel Gröber ": + - ghc-mod + - cabal-helper == 0.5.3.0 + "Yann Esposito ": - holy-project @@ -1638,7 +1640,6 @@ expected-test-failures: - webdriver-angular # Weird conflicts with sandboxing - - ghc-mod - ghcid # Requires locally running server From 06c887c505ffa603495caa2b99bc3dc2401a48be Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 8 Sep 2015 14:40:17 +0100 Subject: [PATCH 02/11] Add inline-r and H --- build-constraints.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index c8e619c6..5327f72b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1016,6 +1016,8 @@ packages: "Mateusz Kowalczyk @Fuuzetsu": - aeson-schema + - inline-r + - H "David Fox @ddssff": - debian @@ -1387,7 +1389,7 @@ packages: "Spencer Janssen ": - Xauth - + "Stefan Berthold": - smallcaps From 494364190e5720ae7bc8b20b18e09158e319620d Mon Sep 17 00:00:00 2001 From: Ivan Lazar Miljenovic Date: Tue, 8 Sep 2015 21:21:49 +1000 Subject: [PATCH 03/11] Add ivanm's packages --- build-constraints.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 887fb91b..5e64ec0b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -698,7 +698,6 @@ packages: - multimap - parallel-io - text-binary - - wl-pprint-text - Chart-cairo - ghc-events - monad-extras @@ -1388,7 +1387,7 @@ packages: "Spencer Janssen ": - Xauth - + "Stefan Berthold": - smallcaps @@ -1399,9 +1398,12 @@ packages: "Devan Stormont ": - forecast-io - + "Sean Hunt @ivan-m": + - wl-pprint-text + - graphviz "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 From 3107557478679e5ec659cfa85d167cbe946ead4c Mon Sep 17 00:00:00 2001 From: Ivan Lazar Miljenovic Date: Tue, 8 Sep 2015 21:23:19 +1000 Subject: [PATCH 04/11] Run tests for graphviz Now works with QC-2.8 and doesn't depend on dot to run tests --- build-constraints.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5e64ec0b..70aff01b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1541,7 +1541,6 @@ skipped-tests: - bson - cabal-install - exceptions - - graphviz - pandoc - testpack - vector @@ -1631,9 +1630,6 @@ expected-test-failures: # https://github.com/fpco/stackage/issues/226 - options - # Depends on a missing graphviz executable - - graphviz - # No AWS creds available - aws From 5ed2d4e4e0248ad89ccfef0f790c8e72476506ca Mon Sep 17 00:00:00 2001 From: Ivan Lazar Miljenovic Date: Tue, 8 Sep 2015 21:39:13 +1000 Subject: [PATCH 05/11] Take over fgl as well --- build-constraints.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 70aff01b..10a1e403 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -72,7 +72,6 @@ packages: - dimensional - executable-hash - executable-path - - fgl - fixed-list - foreign-store - formatting @@ -1402,8 +1401,10 @@ packages: "Sean Hunt @ivan-m": - - wl-pprint-text + - fgl + - fgl-arbitrary - graphviz + - wl-pprint-text "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 From fb685455862abfa33bae7147da1d3120e7aeea39 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 12 Sep 2015 12:25:40 +0900 Subject: [PATCH 06/11] Revert "Disable docopt again due to testsuite failure (#794)" This reverts commit ff376903a50db928b8a1ccf916d05baabf5049a4. --- build-constraints.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 887fb91b..a0b8dc31 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1366,8 +1366,7 @@ packages: "Dmitry Ivanov @ethercrow": - charsetdetect-ae - # https://github.com/fpco/stackage/issues/794 - # - docopt + - docopt - dynamic-state - dyre - io-storage From fcf7a45b7a6d3ce57a5c1669dbbf5b873ad90ff3 Mon Sep 17 00:00:00 2001 From: Sharif Olorin Date: Sat, 12 Sep 2015 06:43:21 +0000 Subject: [PATCH 07/11] Add quickcheck-text and nagios-check --- build-constraints.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index a0b8dc31..d46659d8 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1402,6 +1402,10 @@ packages: "Sean Hunt @olorin": + - quickcheck-text + - nagios-check + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 From 76c759fd061e70b582efb7853661cf4353beeed0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 10 Sep 2015 17:13:57 +0200 Subject: [PATCH 08/11] Register my Hackage projects with Stackage. --- build-constraints.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 251c2f21..b4c2c021 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1413,6 +1413,18 @@ packages: - quickcheck-text - nagios-check + "Peter Simons simons@cryp.to @peti": + - funcmp + - hackage-db + - hledger-interest + - hopenssl + - hsdns + - hsemail + - hsyslog + - language-nix + - nix-paths + - streamproc + "Stackage upper bounds": # https://github.com/fpco/stackage/issues/537 - zlib < 0.6 @@ -1486,6 +1498,9 @@ package-flags: NineP: bytestring-in-base: false + nix-paths: + allow-relative-paths: true + # Used for packages that cannot be built on Linux skipped-builds: - hfsevents From e7d25d214154651f3aa67cd67879a858c96f5212 Mon Sep 17 00:00:00 2001 From: Adam Bergmark Date: Sun, 13 Sep 2015 17:23:15 +0200 Subject: [PATCH 09/11] Fix comment typo --- debian-bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian-bootstrap.sh b/debian-bootstrap.sh index 61bd9a50..f33a8641 100755 --- a/debian-bootstrap.sh +++ b/debian-bootstrap.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex # Work in progress: create a list of commands necessary to get Stackage -# up-and-running on a freshly installed Debian-based system (includin Ubuntu). +# up-and-running on a freshly installed Debian-based system (including Ubuntu). # Quick start: # wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex From 687478036bca023c948da669a40093f1945417ba Mon Sep 17 00:00:00 2001 From: Christoph Hegemann Date: Sun, 13 Sep 2015 23:35:46 +0200 Subject: [PATCH 10/11] Update build-constraints.yaml --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b4c2c021..946380a7 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1424,6 +1424,9 @@ packages: - language-nix - nix-paths - streamproc + + "Christoph Hegemann Date: Mon, 14 Sep 2015 00:01:34 +0200 Subject: [PATCH 11/11] Upper bounds for #827 --- build-constraints.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 946380a7..b4a74f5d 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1424,7 +1424,7 @@ packages: - language-nix - nix-paths - streamproc - + "Christoph Hegemann 0.5.2.0 + # https://github.com/fpco/stackage/issues/827 + - semigroups < 0.17 + - reducers < 3.12 + - text-show < 2.1 + # Package flags are applied to individual packages, and override the values of # global-flags package-flags: