From 05c60c88dcb0755a4daf3f7bd3f1004219400fd3 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 17 Jun 2017 05:08:59 +0300 Subject: bump resolver Also, put Win32 to extra-deps (the then-unreleased version was previously fetched in a .zip tarball from GitHub directly). --- app/AddPath.hs | 1 + app/ListPaths.hs | 1 + app/RemovePath.hs | 1 + app/SetEnv.hs | 1 + app/UnsetEnv.hs | 1 + stack.yaml | 14 +++++++------- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/AddPath.hs b/app/AddPath.hs index 27ec0ed..cf8aa7c 100644 --- a/app/AddPath.hs +++ b/app/AddPath.hs @@ -9,6 +9,7 @@ module Main (main) where import Control.Monad (when, void) import Control.Monad.Trans.Except (catchE, runExceptT, throwE) +import Data.Monoid ((<>)) import Data.List (nub) import System.IO.Error (ioError, isDoesNotExistError) diff --git a/app/ListPaths.hs b/app/ListPaths.hs index 792c98b..e075f9f 100644 --- a/app/ListPaths.hs +++ b/app/ListPaths.hs @@ -11,6 +11,7 @@ import Control.Monad (filterM) import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.Except (runExceptT) import Data.Maybe (fromMaybe) +import Data.Monoid ((<>)) import System.Directory (doesDirectoryExist) import System.Environment (lookupEnv) import System.IO.Error (ioError) diff --git a/app/RemovePath.hs b/app/RemovePath.hs index 779de6f..ed29f3a 100644 --- a/app/RemovePath.hs +++ b/app/RemovePath.hs @@ -9,6 +9,7 @@ module Main (main) where import Control.Monad (void, when) import Control.Monad.Trans.Except (catchE, runExceptT, throwE) +import Data.Monoid ((<>)) import System.IO.Error (ioError, isDoesNotExistError) import Options.Applicative diff --git a/app/SetEnv.hs b/app/SetEnv.hs index 6932198..6c941af 100644 --- a/app/SetEnv.hs +++ b/app/SetEnv.hs @@ -9,6 +9,7 @@ module Main (main) where import Control.Monad (void) import Control.Monad.Trans.Except (runExceptT) +import Data.Monoid ((<>)) import System.IO.Error (ioError) import Options.Applicative diff --git a/app/UnsetEnv.hs b/app/UnsetEnv.hs index b841f86..5ab28d5 100644 --- a/app/UnsetEnv.hs +++ b/app/UnsetEnv.hs @@ -9,6 +9,7 @@ module Main (main) where import Control.Monad (void) import Control.Monad.Trans.Except (runExceptT) +import Data.Monoid ((<>)) import System.IO.Error (ioError) import Options.Applicative diff --git a/stack.yaml b/stack.yaml index 9b3d473..bd324b9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,15 +1,15 @@ -resolver: lts-7.11 +resolver: lts-8.18 packages: -- . -- location: https://github.com/haskell/win32/archive/bf54fa7134eb9b1366f827426f050d833b2cda54.zip - extra-dep: true -extra-deps: [] +- '.' +extra-deps: +- Win32-2.5.4.1 +- directory-1.3.1.1 +- process-1.6.0.0 flags: {} extra-package-dbs: [] -allow-newer: true system-ghc: false # require-stack-version: -any # Default -# require-stack-version: ">=1.1" +# require-stack-version: ">=1.4" # arch: i386 # arch: x86_64 # extra-include-dirs: [/path/to/dir] -- cgit v1.2.3