Merge branch 'master' into faster-index-populate

Conflicts:
	src/Stack/PackageIndex.hs

Author: snoyberg

.travis.yml

@@ -29,21 +29,21 @@ install:
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - travis_retry cabal update
- - cabal install cpphs
- - cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls
+ - cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0
 
 script:
  - if [ -f configure.ac ]; then autoreconf -i; fi
- - cabal configure --enable-tests --enable-benchmarks -v2  # -v2 provides useful information for debugging
+ - cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options=-O0 # -v2 provides useful information for debugging
  - cabal build   # this builds all libraries and executables (including tests/benchmarks)
  - cabal test
  - cabal check
  - cabal sdist   # tests that a source-distribution can be generated
 
  - cabal copy
  - cd test/integration
- - stack setup
- - stack test
+ # Takes too long for now
+ # - stack setup
+ # - stack test
  - cd ../..
 
 # Check that the resulting source distribution can be built & installed.

ChangeLog.md

@@ -2,6 +2,8 @@
 
 * Fall back to cabal dependency solver when a snapshot can't be found
 * Basic implementation of `stack new` [#137](https://github.com/commercialhaskell/stack/issues/137)
+* Build haddocks for dependencies [#143](https://github.com/commercialhaskell/stack/issues/143)
+* `stack solver` command [#364](https://github.com/commercialhaskell/stack/issues/364)
 
 ## 0.0.3
 

README.md

@@ -56,8 +56,7 @@ A full description of the architecture
   please see
   [the FAQ](https://github.com/commercialhaskell/stack/wiki/FAQ).
 * For general questions, comments, feedback and support please write
-  to
-  [the Commercial Haskell mailing list](https://groups.google.com/d/forum/commercialhaskell).
+  to [the stack mailing list](https://groups.google.com/d/forum/haskell-stack).
 * For bugs, issues, or requests please
   [open an issue](https://github.com/commercialhaskell/stack/issues/new).
 

src/Data/Aeson/Extended.hs

@@ -15,9 +15,9 @@ import Data.Text (unpack, Text)
 import Data.Monoid ((<>))
 
 (.:) :: FromJSON a => Object -> Text -> Parser a
-(.:) o p = modifyFailure (("failed to parse field " <> unpack p <> ": ") <>) (o A..: p)
+(.:) o p = modifyFailure (("failed to parse field '" <> unpack p <> "': ") <>) (o A..: p)
 {-# INLINE (.:) #-}
 
 (.:?) :: FromJSON a => Object -> Text -> Parser (Maybe a)
-(.:?) o p = modifyFailure (("failed to parse field " <> unpack p <> ": ") <>) (o A..:? p)
+(.:?) o p = modifyFailure (("failed to parse field '" <> unpack p <> "': ") <>) (o A..:? p)
 {-# INLINE (.:?) #-}

src/Data/Binary/VersionTagged.hs

@@ -1,46 +1,48 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 -- | Tag a Binary instance with the stack version number to ensure we're
 -- reading a compatible format.
 module Data.Binary.VersionTagged
     ( taggedDecodeOrLoad
     , taggedEncodeFile
+    , BinarySchema (..)
     ) where
 
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Data.Binary (Binary (..), encodeFile, decodeFileOrFail, putWord8, getWord8)
 import Control.Exception.Enclosed (tryIO)
-import qualified Paths_stack
-import Stack.Types.Version (Version, fromCabalVersion)
 import System.FilePath (takeDirectory)
 import System.Directory (createDirectoryIfMissing)
 import qualified Data.ByteString as S
 import Data.ByteString (ByteString)
 import Control.Monad (forM_, when)
-
-tag :: Version
-tag = fromCabalVersion Paths_stack.version
+import Data.Proxy
 
 magic :: ByteString
-magic = "STACK"
+magic = "stack"
+
+-- | A @Binary@ instance that also has a schema version
+class Binary a => BinarySchema a where
+    binarySchema :: Proxy a -> Int
 
 newtype WithTag a = WithTag a
-instance Binary a => Binary (WithTag a) where
+instance forall a. BinarySchema a => Binary (WithTag a) where
     get = do
         forM_ (S.unpack magic) $ \w -> do
             w' <- getWord8
             when (w /= w')
                 $ fail "Mismatched magic string, forcing a recompute"
         tag' <- get
-        if tag == tag'
+        if binarySchema (Proxy :: Proxy a) == tag'
             then fmap WithTag get
             else fail "Mismatched tags, forcing a recompute"
     put (WithTag x) = do
         mapM_ putWord8 $ S.unpack magic
-        put tag
+        put (binarySchema (Proxy :: Proxy a))
         put x
 
 -- | Write to the given file, with a version tag.
-taggedEncodeFile :: (Binary a, MonadIO m)
+taggedEncodeFile :: (BinarySchema a, MonadIO m)
                  => FilePath
                  -> a
                  -> m ()
@@ -51,7 +53,7 @@ taggedEncodeFile fp x = liftIO $ do
 -- | Read from the given file. If the read fails, run the given action and
 -- write that back to the file. Always starts the file off with the version
 -- tag.
-taggedDecodeOrLoad :: (Binary a, MonadIO m)
+taggedDecodeOrLoad :: (BinarySchema a, MonadIO m)
                    => FilePath
                    -> m a
                    -> m a

src/Options/Applicative/Builder/Extra.hs

@@ -2,8 +2,10 @@
 
 module Options.Applicative.Builder.Extra
   (boolFlags
+  ,boolFlagsNoDefault
   ,maybeBoolFlags
   ,enableDisableFlags
+  ,enableDisableFlagsNoDefault
   ,extraHelpOption
   ,execExtraHelp)
   where
@@ -17,13 +19,23 @@ import System.FilePath (takeBaseName)
 boolFlags :: Bool -> String -> String -> Mod FlagFields Bool -> Parser Bool
 boolFlags defaultValue = enableDisableFlags defaultValue True False
 
+-- | Enable/disable flags for a @Bool@, without a default case (to allow chaining @<|>@s).
+boolFlagsNoDefault :: String -> String -> Mod FlagFields Bool -> Parser Bool
+boolFlagsNoDefault = enableDisableFlagsNoDefault True False
+
 -- | Enable/disable flags for a @(Maybe Bool)@.
 maybeBoolFlags :: String -> String -> Mod FlagFields (Maybe Bool) -> Parser (Maybe Bool)
 maybeBoolFlags = enableDisableFlags Nothing (Just True) (Just False)
 
 -- | Enable/disable flags for any type.
 enableDisableFlags :: a -> a -> a -> String -> String -> Mod FlagFields a -> Parser a
 enableDisableFlags defaultValue enabledValue disabledValue name helpSuffix mods =
+  enableDisableFlagsNoDefault enabledValue disabledValue name helpSuffix mods <|>
+  pure defaultValue
+
+-- | Enable/disable flags for any type, without a default (to allow chaining @<|>@s)
+enableDisableFlagsNoDefault :: a -> a -> String -> String -> Mod FlagFields a -> Parser a
+enableDisableFlagsNoDefault enabledValue disabledValue name helpSuffix mods =
   flag' enabledValue
         (long name <>
          help ("Enable " ++ helpSuffix) <>
@@ -41,8 +53,7 @@ enableDisableFlags defaultValue enabledValue disabledValue name helpSuffix mods
         (internal <>
          long ("disable-" ++ name) <>
          help ("Disable " ++ helpSuffix) <>
-         mods) <|>
-  pure defaultValue
+         mods)
 
 -- | Show an extra help option (e.g. @--docker-help@ shows help for all @--docker*@ args).
 -- To actually show have that help appear, use 'execExtraHelp' before executing the main parser.