From eaf98538f2c8ff2abdac970c70930166d37e8c98 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Wed, 21 Aug 2019 19:18:04 +0300 Subject: bump resolver It includes the required Win32 version, so there's no need to mess with extra-deps. Also, it uses a newer Cabal version, which seems to require the Paths_ module to be listed in other-modules (and adds the autogen-modules field). --- stack.yaml | 6 +----- windows-env.cabal | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/stack.yaml b/stack.yaml index cfd782d..d6b0357 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,11 +1,7 @@ -resolver: lts-8.18 +resolver: lts-14.1 packages: - '.' extra-deps: -- Win32-2.5.4.1 -- directory-1.3.1.1 -- process-1.6.0.0 -- time-1.8.0.4 flags: {} extra-package-dbs: [] system-ghc: false diff --git a/windows-env.cabal b/windows-env.cabal index 87d4948..a9daa97 100644 --- a/windows-env.cabal +++ b/windows-env.cabal @@ -37,7 +37,11 @@ library executable addpath hs-source-dirs: app main-is: AddPath.hs - other-modules: Utils.Path, Utils.Prompt, Utils.PromptMessage + other-modules: Utils.Path + , Utils.Prompt + , Utils.PromptMessage + , Paths_windows_env + autogen-modules: Paths_windows_env ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: base , optparse-applicative @@ -48,7 +52,11 @@ executable addpath executable paths hs-source-dirs: app main-is: ListPaths.hs - other-modules: Utils.Path, Utils.Prompt, Utils.PromptMessage + other-modules: Utils.Path + , Utils.Prompt + , Utils.PromptMessage + , Paths_windows_env + autogen-modules: Paths_windows_env ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: base , directory @@ -60,7 +68,10 @@ executable paths executable delpath hs-source-dirs: app main-is: RemovePath.hs - other-modules: Utils.Prompt, Utils.PromptMessage + other-modules: Utils.Prompt + , Utils.PromptMessage + , Paths_windows_env + autogen-modules: Paths_windows_env ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: base , optparse-applicative @@ -71,7 +82,10 @@ executable delpath executable setenv hs-source-dirs: app main-is: SetEnv.hs - other-modules: Utils.Prompt, Utils.PromptMessage + other-modules: Utils.Prompt + , Utils.PromptMessage + , Paths_windows_env + autogen-modules: Paths_windows_env ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: base , optparse-applicative @@ -82,7 +96,10 @@ executable setenv executable delenv hs-source-dirs: app main-is: UnsetEnv.hs - other-modules: Utils.Prompt, Utils.PromptMessage + other-modules: Utils.Prompt + , Utils.PromptMessage + , Paths_windows_env + autogen-modules: Paths_windows_env ghc-options: -Wall -Werror -threaded -rtsopts -with-rtsopts=-N build-depends: base , optparse-applicative -- cgit v1.2.3