62e1886 · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'master' into pattern-warnings

commit62e1886a2e53a027b128ec0ef5f9a3fcf416f92a authorEvan Czaplicki <info@elm-lang.org> dateMon 17 Aug 2015, 15:36 (11 years ago) parentd492e71 ed48cd2

2 files changed+4−2

compare with master

unifiedsplit

elm-compiler.cabal+2−2 src/Elm/Utils.hs+2

elm-compiler.cabal+2−2

@@ -127,8 +127,8 @@ Library

127127 ansi-terminal >= 0.6.2.1 && < 0.7,

128128 base >=4.2 && <5,

129129 binary >= 0.7.0.0 && < 0.8,

130− blaze-html >= 0.5 && < 0.8,

131− blaze-markup >= 0.5.1 && < 0.7,

130+ blaze-html >= 0.5 && < 0.9,

131+ blaze-markup >= 0.5.1 && < 0.8,

132132 bytestring >= 0.9 && < 0.11,

133133 cmdargs >= 0.7 && < 0.11,

134134 containers >= 0.3 && < 0.6,

src/Elm/Utils.hs+2

@@ -95,6 +95,8 @@ missingExe command =

9595-- GET STATIC ASSETS

9696

9797{-| Get the absolute path to a data file. If you install with cabal it will look

98+in a directory generated by cabal. If that is not found, it will look for the

99+directory pointed to by the environment variable ELM_HOME.

98100-}

99101getAsset :: String -> (FilePath -> IO FilePath) -> FilePath -> IO FilePath

100102getAsset project getDataFileName name =