From 576ed0d892cd76fb7c241efea977c3142b30cf82 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 13 Apr 2015 09:05:49 +0300 Subject: [PATCH 01/41] 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 02/41] 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 03/41] 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 04/41] 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 05/41] 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 06/41] 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 07/41] 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 08/41] 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 09/41] 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 10/41] 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 11/41] 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 12/41] 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 13/41] 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 14/41] 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 15/41] 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 16/41] 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 17/41] 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 18/41] 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 19/41] 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 20/41] 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 21/41] 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 22/41] 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 23/41] 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 24/41] 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 25/41] 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 26/41] 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 a8a59af5a4bba3de5cdf8bbe110a8fd661d06815 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 27 Apr 2015 11:15:38 +0300 Subject: [PATCH 27/41] 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 28/41] 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 29/41] 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 30/41] + 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 31/41] 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 32/41] 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 33/41] 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 34/41] 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 35/41] 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 36/41] 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 37/41] 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 38/41] 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 39/41] 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 40/41] 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 41/41] 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: