git.iko.soy/elk
on master help sign in
Merge branch 'master' into pattern-warnings
62e1886Evan Czaplicki
elm-compiler.cabal+2−2
compare with master
unifiedsplit
@@ -127,8 +127,8 @@ Library
127 ansi-terminal >= 0.6.2.1 && < 0.7,
127 ansi-terminal >= 0.6.2.1 && < 0.7,
128 base >=4.2 && <5,
128 base >=4.2 && <5,
129 binary >= 0.7.0.0 && < 0.8,
129 binary >= 0.7.0.0 && < 0.8,
130− blaze-html >= 0.5 && < 0.8,
130+ blaze-html >= 0.5 && < 0.9,
131− blaze-markup >= 0.5.1 && < 0.7,
131+ blaze-markup >= 0.5.1 && < 0.8,
132 bytestring >= 0.9 && < 0.11,
132 bytestring >= 0.9 && < 0.11,
133 cmdargs >= 0.7 && < 0.11,
133 cmdargs >= 0.7 && < 0.11,
134 containers >= 0.3 && < 0.6,
134 containers >= 0.3 && < 0.6,
src/Elm/Utils.hs+2
@@ -95,6 +95,8 @@ missingExe command =
95-- GET STATIC ASSETS
95-- GET STATIC ASSETS
96
96
97{-| Get the absolute path to a data file. If you install with cabal it will look
97{-| 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.
98-}
100-}
99getAsset :: String -> (FilePath -> IO FilePath) -> FilePath -> IO FilePath
101getAsset :: String -> (FilePath -> IO FilePath) -> FilePath -> IO FilePath
100getAsset project getDataFileName name =
102getAsset project getDataFileName name =