Merge remote-tracking branch 'origin/stable'

Author: borsboom

package.yaml

@@ -22,6 +22,7 @@ extra-source-files:
 - ChangeLog.md
 - README.md
 - doc/*.md
+- package.yaml
 - src/setup-shim/StackSetupShim.hs
 - stack.yaml
 - test/package-dump/ghc-7.10.txt

src/Text/PrettyPrint/Leijen/Extended.hs

@@ -162,7 +162,7 @@ instance Display (Doc a) where
 type AnsiDoc = Doc AnsiAnn
 
 newtype AnsiAnn = AnsiAnn [SGR]
-    deriving (Eq, Ord, Show, Monoid)
+    deriving (Eq, Show, Monoid)
 
 class HasAnsiAnn a where
     getAnsiAnn :: a -> AnsiAnn
@@ -297,6 +297,7 @@ data SGRTag
     | TagSwapForegroundBackground
     | TagColorForeground
     | TagColorBackground
+    | TagRGBColor
     deriving (Eq, Ord)
 
 getSGRTag :: SGR -> SGRTag
@@ -309,3 +310,4 @@ getSGRTag SetVisible{}                  = TagVisible
 getSGRTag SetSwapForegroundBackground{} = TagSwapForegroundBackground
 getSGRTag (SetColor Foreground _ _)     = TagColorForeground
 getSGRTag (SetColor Background _ _)     = TagColorBackground
+getSGRTag SetRGBColor{}                 = TagRGBColor

stack-nightly.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2017-11-25
+resolver: nightly-2017-12-06
 nix:
   # --nix on the command-line to enable.
   enable: false
@@ -8,3 +8,4 @@ nix:
 extra-deps:
 - bindings-uname-0.1
 - unliftio-0.2.0.0
+- ansi-terminal-0.7.1.1

stack.yaml

@@ -27,3 +27,5 @@ extra-deps:
 - hsc2hs-0.68.2
 - hpack-0.20.0
 - unliftio-0.2.0.0
+- ansi-terminal-0.7.1.1
+- ansi-wl-pprint-0.6.8.1

test/integration/tests/internal-libraries/files/stack.yaml

@@ -1,4 +1,4 @@
-resolver: ghc-8.0.2
+resolver: ghc-8.2.2
 extra-deps:
 - stm-2.4.4.1
 - mtl-2.2.1