From d57f56e60ff7e613bdb7364a9a345159bcf8653a Mon Sep 17 00:00:00 2001
From: mrkkrp <markkarpov@opmbx.org>
Date: Mon, 22 Feb 2016 13:08:27 +0600
Subject: [PATCH] Build with path-io-1.0.0 and bump to v1.0.4.2

---
 ChangeLog.md        | 5 +++++
 src/Stack/Config.hs | 4 ++--
 stack-7.8.yaml      | 2 +-
 stack.cabal         | 4 ++--
 stack.yaml          | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index b6b2b77edd..9147246241 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.0.4.2
+
+Build with path-io-1.0.0. There are no changes in behaviour from 1.0.4,
+so no binaries are released for this version.
+
 ## 1.0.4.1
 
 Fixes build with aeson-0.11.0.0. There are no changes in behaviour from 1.0.4,
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
index 38069a35f3..428cfa0c3b 100644
--- a/src/Stack/Config.hs
+++ b/src/Stack/Config.hs
@@ -264,7 +264,7 @@ configFromConfigMonoid configStackRoot configUserConfigPath mresolver mproject c
      configLocalBin <-
          case configMonoidLocalBinPath of
              Nothing -> do
-                 localDir <- getAppUserDataDir $(mkRelDir "local")
+                 localDir <- getAppUserDataDir "local"
                  return $ localDir </> $(mkRelDir "bin")
              Just userPath ->
                  (case mproject of
@@ -641,7 +641,7 @@ determineStackRootAndOwnership = do
     stackRoot <- do
         mstackRoot <- liftIO $ lookupEnv stackRootEnvVar
         case mstackRoot of
-            Nothing -> getAppUserDataDir $(mkRelDir stackProgName)
+            Nothing -> getAppUserDataDir stackProgName
             Just x -> parseAbsDir x
 
     (existingStackRootOrParentDir, userOwnsIt) <- do
diff --git a/stack-7.8.yaml b/stack-7.8.yaml
index cdaf56e01b..93ed223299 100644
--- a/stack-7.8.yaml
+++ b/stack-7.8.yaml
@@ -1,7 +1,7 @@
 resolver: lts-2.22
 extra-deps:
 - path-0.5.3
-- path-io-0.3.1
+- path-io-1.0.0
 - directory-1.2.2.0
 - Win32-notify-0.3.0.1
 - hfsevents-0.1.5
diff --git a/stack.cabal b/stack.cabal
index aeba6bdfbe..d9ca52b320 100644
--- a/stack.cabal
+++ b/stack.cabal
@@ -1,5 +1,5 @@
 name:                stack
-version:             1.0.4.1
+version:             1.0.4.2
 synopsis:            The Haskell Tool Stack
 description:         Please see the README.md for usage information, and
                      the wiki on Github for more details.  Also, note that
@@ -175,7 +175,7 @@ library
                    , mtl >= 2.1.3.1
                    , optparse-applicative >= 0.11 && < 0.13
                    , path >= 0.5.1
-                   , path-io >= 0.3.1 && < 1.0.0
+                   , path-io >= 1.0.0 && < 2.0.0
                    , persistent >= 2.1.2
                    , persistent-sqlite >= 2.1.4
                    , persistent-template >= 2.1.1
diff --git a/stack.yaml b/stack.yaml
index 5e7f2a0846..5f60225ac4 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -10,5 +10,5 @@ nix:
   packages:
     - zlib
 extra-deps:
-- path-io-0.3.1
+- path-io-1.0.0
 - hpack-0.9.0