From 43848f50e96bfd56992c8574541707b13a676b68 Mon Sep 17 00:00:00 2001 From: Justus Adam Date: Thu, 14 Jan 2016 16:33:15 +0100 Subject: [PATCH] stack init --- .gitignore | 1 + mustache.cabal | 1 - src/lib/Text/Mustache/Compile.hs | 3 +-- stack.yaml | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 stack.yaml diff --git a/.gitignore b/.gitignore index ac0a1bd..103ac8e 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ cabal.sandbox.config *.aux *.hp .DS_Store +.stack-work/ diff --git a/mustache.cabal b/mustache.cabal index fba3b91..c7e5126 100644 --- a/mustache.cabal +++ b/mustache.cabal @@ -55,7 +55,6 @@ library , filepath , scientific , base-unicode-symbols - , ja-base-extra >= 0.2.1 , containers hs-source-dirs: src/lib default-language: Haskell2010 diff --git a/src/lib/Text/Mustache/Compile.hs b/src/lib/Text/Mustache/Compile.hs index 2a9f716..c5f2942 100644 --- a/src/lib/Text/Mustache/Compile.hs +++ b/src/lib/Text/Mustache/Compile.hs @@ -21,7 +21,6 @@ import Control.Monad.State import Control.Monad.Trans.Either import Control.Monad.Unicode import Data.Bool -import Data.Function.JAExtra import Data.HashMap.Strict as HM import Data.Monoid.Unicode ((∅)) import Data.Text hiding (concat, find, map, uncons) @@ -122,7 +121,7 @@ getPartials' _ = (∅) flattenPartials ∷ TemplateCache → TemplateCache -flattenPartials = stuffWith $ foldrWithKey $ insertWith discard +flattenPartials m = foldrWithKey (insertWith (\_ b -> b)) m m {-| diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..fe11970 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,32 @@ +# For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md + +# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) +resolver: lts-3.22 + +# Local packages, usually specified by relative directory name +packages: +- '.' + +# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3) +extra-deps: [] + +# Override default flag values for local packages and extra-deps +flags: {} + +# Extra package databases containing global packages +extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true + +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: >= 1.0.0 + +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 + +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir]