From 46f95d8ddbf10babb8242bc81543f97d27a83e79 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 24 Dec 2014 12:13:36 +0200
Subject: [PATCH 01/35] 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 <michael@snoyman.com>
Date: Wed, 18 Mar 2015 15:37:00 +0200
Subject: [PATCH 02/35] 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 <michael@snoyman.com>
Date: Wed, 18 Mar 2015 15:47:25 +0200
Subject: [PATCH 03/35] 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 <michael@snoyman.com>
Date: Sun, 22 Mar 2015 16:57:26 +0200
Subject: [PATCH 04/35] 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 406c9bc02a057b81b532001fef8cbe7b27774608 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 12 Apr 2015 12:59:04 +0300
Subject: [PATCH 05/35] 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 c67909b37a10dad2b687a426e9984db28b428808 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 06:55:42 +0300
Subject: [PATCH 06/35] 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 <tmcdonell@cse.unsw.edu.au>":
-        - accelerate
+        []
+        # - accelerate GHC 7.10
 
     "Dan Burton <danburton.email@gmail.com>":
         - yesod-gitrev
@@ -446,14 +449,16 @@ packages:
         - json-autotype
 
     "Dominic Steinitz <dominic@steinitz.org>":
-        - yarr
+        []
+        # - yarr GHC 7.10
 
     "Roman Cheplyaka <roma@ro-che.info>":
         - 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 <giorgidze@gmail.com>":
@@ -485,21 +491,22 @@ packages:
     "Joachim Breitner <mail@joachim-breitner.de>":
         - circle-packing
         - arbtt
-        - ghc-heap-view
+        # - ghc-heap-view GHC 7.10
         - tttool
         - gipeda
         - list-fusion-probe
         - haskell-spacegoo
 
     "Aditya Bhargava <adit@adit.io":
-        - HandsomeSoup
+        []
+        # - HandsomeSoup GHC 7.10
 
     "Clint Adams <clint@debian.org>":
-        - 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 <dave.c.turner@gmail.com>":
-        - 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 07:16:05 +0300
Subject: [PATCH 07/35] 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 <aenor.realm@gmail.com> @wiz":
-        - soap
-        - soap-tls
-        - soap-openssl
+        []
+        # GHC 7.10, via iconv
+        #- soap
+        #- soap-tls
+        #- soap-openssl
 
     "Andres Löh <andres@well-typed.com> @kosmikus":
         - generics-sop

From 5488c156103ad613bc8449adee24f6071968e4d7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 07:20:19 +0300
Subject: [PATCH 08/35] 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 <adit@adit.io":
-        []
-        # - HandsomeSoup GHC 7.10
+        - HandsomeSoup
 
     "Clint Adams <clint@debian.org>":
         #- hOpenPGP GHC 7.10, via syb-with-class

From 99c482895b93ec909a33974c27f2f4a134b7f969 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 07:40:29 +0300
Subject: [PATCH 09/35] 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 76ec5dbb248fae5875577a5b676c67b8d18d0ace Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 08:46:52 +0300
Subject: [PATCH 10/35] 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 09:48:18 +0300
Subject: [PATCH 11/35] 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 <marcin.jan.mrotek@gmail.com>":
         - diagrams-hsqml
@@ -860,10 +864,11 @@ packages:
         - cabal-file-th
 
     "Gershom Bazerman <gershomb@gmail.com> @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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 10:08:10 +0300
Subject: [PATCH 12/35] 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 <agocorona@gmail.com>":
         - RefSerialize
         - TCache
-        - Workflow
-        - MFlow
+        # https://github.com/agocorona/Workflow/issues/5 GHC 7.10
+        # - Workflow
+        # - MFlow
 
     "Edward Kmett <ekmett@gmail.com>":
         - ad

From 5a21a2827071bb7c5d92fbfaedf75f39adeda598 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 10:49:43 +0300
Subject: [PATCH 13/35] 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 11:28:57 +0300
Subject: [PATCH 14/35] 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 abc8ff662dfecf5977bbe74cfdc71f0bb8b309bb Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 12:19:14 +0300
Subject: [PATCH 15/35] 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 13:00:33 +0300
Subject: [PATCH 16/35] 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 <lykahb@gmail.com>":
         - 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 9df6b583363a169606a62520b55859f1c577f07f Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 13:38:56 +0300
Subject: [PATCH 17/35] 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 <d12frosted@icloud.com>":
-        - 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 14:20:10 +0300
Subject: [PATCH 18/35] 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 <alfredo.dinapoli@gmail.com>":
-        - 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 <yann.esposito@gmail.com>":
-        - holy-project
+        []
+        # https://github.com/yogsototh/holy-project/issues/5 GHC 7.10
+        # - holy-project
 
     "Paul Rouse <pgr@doynton.org>":
         - 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 <marcin.jan.mrotek@gmail.com>":
         - 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 a8d6f1d3eca257e3f8427fdb5e760b0fd144e3a9 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 30 Apr 2015 16:17:05 +0300
Subject: [PATCH 19/35] 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 <giorgidze@gmail.com>":
@@ -515,7 +514,7 @@ packages:
     "Clint Adams <clint@debian.org>":
         #- 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 16:46:15 +0300
Subject: [PATCH 20/35] 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 17:16:24 +0300
Subject: [PATCH 21/35] 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 <agocorona@gmail.com>":
         - RefSerialize
         - TCache
-        # https://github.com/agocorona/Workflow/issues/5 GHC 7.10
-        # - Workflow
-        # - MFlow
+        - Workflow
+        - MFlow
 
     "Edward Kmett <ekmett@gmail.com>":
         - 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 17:56:03 +0300
Subject: [PATCH 22/35] 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 <ekmett@gmail.com>":
         - ad
@@ -441,8 +442,7 @@ packages:
 
     "Boris Lykah <lykahb@gmail.com>":
         - 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 18:14:37 +0300
Subject: [PATCH 23/35] 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 <michael@snoyman.com>
Date: Thu, 30 Apr 2015 18:36:06 +0300
Subject: [PATCH 24/35] 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 <alfredo.dinapoli@gmail.com>":
-        []
-        # https://github.com/adinapoli/mandrill/issues/14
-        # - mandrill GHC 7.10
+        - mandrill
 
     "Jasper Van der Jeugt":
         - blaze-html

From 2a114737d7a67b29891fa847596fb25a5de0a259 Mon Sep 17 00:00:00 2001
From: David Turner <dave.c.turner@gmail.com>
Date: Fri, 1 May 2015 05:47:16 +0100
Subject: [PATCH 25/35] 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 <dave.c.turner@gmail.com>":
-        []
-        # GHC 7.10
-        #- alarmclock
-        #- bank-holidays-england
+        - alarmclock
+        - bank-holidays-england
 
     "Haskell Servant jkarni@gmail.com @jkarni":
         - servant

From af49d1faa5d1acdc62c4bfbae33dc18a4af9b6be Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 1 May 2015 07:54:00 +0300
Subject: [PATCH 26/35] 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 <michael@snoyman.com>
Date: Fri, 1 May 2015 08:04:38 +0300
Subject: [PATCH 27/35] 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 <michael@snoyman.com>
Date: Fri, 1 May 2015 08:26:21 +0300
Subject: [PATCH 28/35] 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 ab0e030ce961831903a5bf2298305e274507caad Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Fri, 1 May 2015 11:20:39 +0300
Subject: [PATCH 29/35] 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 <tmcdonell@cse.unsw.edu.au>":
-        []
-        # - accelerate GHC 7.10
+        - accelerate
 
     "Dan Burton <danburton.email@gmail.com>":
         - 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 <michael@snoyman.com>
Date: Fri, 1 May 2015 11:32:11 +0300
Subject: [PATCH 30/35] 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 <michael@snoyman.com>
Date: Fri, 1 May 2015 13:31:00 +0300
Subject: [PATCH 31/35] 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 <yann.esposito@gmail.com>
Date: Fri, 1 May 2015 18:55:38 +0200
Subject: [PATCH 32/35] 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 <yann.esposito@gmail.com>":
         []
-        # 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 <pgr@doynton.org>":
         - yesod-auth-hashdb

From f35f993530d3b1d636b4875c33105f93e01ef9c4 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 2 May 2015 21:10:43 +0300
Subject: [PATCH 33/35] 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 <michael@snoyman.com>
Date: Sat, 2 May 2015 21:14:05 +0300
Subject: [PATCH 34/35] 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 <yann.esposito@gmail.com>":
-        []
-        # Should have fixed: https://github.com/yogsototh/holy-project/issues/5 GHC 7.10
         - holy-project
 
     "Paul Rouse <pgr@doynton.org>":

From 13ec252971064c1fb6289f1789034bb67c4a8fb0 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 3 May 2015 17:49:52 +0300
Subject: [PATCH 35/35] 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