From cd1b84036808091da9f71c032bd10334883b24ed Mon Sep 17 00:00:00 2001 From: Joshua Clayton Date: Sat, 17 Mar 2018 21:01:00 -0400 Subject: [PATCH] Allow Stack to build the project and run the test suite What? ===== This bumps Stack dependencies and locks certain packages to ensure a proper build. --- src/Unused/Regex.hs | 2 +- stack.yaml | 17 ++++++----------- unused.cabal | 3 ++- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/Unused/Regex.hs b/src/Unused/Regex.hs index 798c10b..e61de65 100644 --- a/src/Unused/Regex.hs +++ b/src/Unused/Regex.hs @@ -9,5 +9,5 @@ import Text.Regex.TDFA matchRegex :: String -> String -> Bool matchRegex = matchTest . stringToRegex -stringToRegex :: RegexMaker Regex CompOption ExecOption String => String -> Regex +stringToRegex :: String -> Regex stringToRegex = makeRegex diff --git a/stack.yaml b/stack.yaml index cdb9abb..162fa2e 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,25 +2,20 @@ # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/ # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2) -resolver: lts-6.0 +resolver: lts-11.0 # 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: -- aeson-0.11.2.1 -- call-stack-0.1.0 - cassava-0.4.5.1 -- hspec-2.3.2 -- hspec-core-2.3.2 -- hspec-discover-2.3.2 -- hspec-expectations-0.8.2 +- hspec-2.5.0 +- hspec-core-2.5.0 +- hspec-discover-2.5.0 - inflections-0.3.0.0 -- integer-logarithms-1 -- megaparsec-5.1.2 -- mmorph-1.0.9 -- scientific-0.3.4.10 +- megaparsec-5.3.1 +- terminal-progress-bar-0.1.1.1 # Override default flag values for local packages and extra-deps flags: {} diff --git a/unused.cabal b/unused.cabal index fd64590..c6a4774 100644 --- a/unused.cabal +++ b/unused.cabal @@ -67,7 +67,7 @@ library , filepath , directory , regex-tdfa - , terminal-progress-bar + , terminal-progress-bar >= 0.1.1.1 && < 0.1.2 , ansi-terminal , unix , parallel-io @@ -117,6 +117,7 @@ test-suite unused-test , Unused.UtilSpec , Unused.Cache.FindArgsFromIgnoredPathsSpec , Unused.AliasesSpec + , Unused.ProjectionSpec ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall default-language: Haskell2010 default-extensions: OverloadedStrings