From 7d7f8ff1aeb3d3f92e2753731a710d9a886ab93b Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Thu, 3 Sep 2015 22:58:18 -0700 Subject: [PATCH 1/2] Fix stack's haddock build failure (fpco/stackage#802) --- src/Stack/Types/Compiler.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Stack/Types/Compiler.hs b/src/Stack/Types/Compiler.hs index 51101c8cd0..c3b430be57 100644 --- a/src/Stack/Types/Compiler.hs +++ b/src/Stack/Types/Compiler.hs @@ -30,8 +30,8 @@ data WhichCompiler data CompilerVersion = GhcVersion {-# UNPACK #-} !Version | GhcjsVersion - {-# UNPACK #-} !Version -- ^ GHCJS version - {-# UNPACK #-} !Version -- ^ GHC version + {-# UNPACK #-} !Version -- GHCJS version + {-# UNPACK #-} !Version -- GHC version deriving (Generic, Show, Eq, Ord) instance Binary CompilerVersion instance NFData CompilerVersion where From 890e53bacd265d3683db1b1251c9edeeb7d71b97 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Thu, 3 Sep 2015 23:25:22 -0700 Subject: [PATCH 2/2] Bump version to 0.1.4.1 --- ChangeLog.md | 4 ++++ stack.cabal | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 9cd9bffd9b..36d5e4f147 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +## 0.1.4.1 + +Fix stack's own Haddocks. No changes to functionality (only comments updated). + ## 0.1.4.0 Major changes: diff --git a/stack.cabal b/stack.cabal index ccdaa981db..2109230abc 100644 --- a/stack.cabal +++ b/stack.cabal @@ -1,5 +1,5 @@ name: stack -version: 0.1.4.0 +version: 0.1.4.1 synopsis: The Haskell Tool Stack description: Please see the README.md for usage information, and the wiki on Github for more details. Also, note that