Skip to content

Commit d57f56e

Browse files
mrkkrpborsboom
authored andcommitted
Build with path-io-1.0.0 and bump to v1.0.4.2
1 parent ed10c64 commit d57f56e

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 1.0.4.2
4+
5+
Build with path-io-1.0.0. There are no changes in behaviour from 1.0.4,
6+
so no binaries are released for this version.
7+
38
## 1.0.4.1
49

510
Fixes build with aeson-0.11.0.0. There are no changes in behaviour from 1.0.4,

src/Stack/Config.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ configFromConfigMonoid configStackRoot configUserConfigPath mresolver mproject c
264264
configLocalBin <-
265265
case configMonoidLocalBinPath of
266266
Nothing -> do
267-
localDir <- getAppUserDataDir $(mkRelDir "local")
267+
localDir <- getAppUserDataDir "local"
268268
return $ localDir </> $(mkRelDir "bin")
269269
Just userPath ->
270270
(case mproject of
@@ -641,7 +641,7 @@ determineStackRootAndOwnership = do
641641
stackRoot <- do
642642
mstackRoot <- liftIO $ lookupEnv stackRootEnvVar
643643
case mstackRoot of
644-
Nothing -> getAppUserDataDir $(mkRelDir stackProgName)
644+
Nothing -> getAppUserDataDir stackProgName
645645
Just x -> parseAbsDir x
646646

647647
(existingStackRootOrParentDir, userOwnsIt) <- do

stack-7.8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
resolver: lts-2.22
22
extra-deps:
33
- path-0.5.3
4-
- path-io-0.3.1
4+
- path-io-1.0.0
55
- directory-1.2.2.0
66
- Win32-notify-0.3.0.1
77
- hfsevents-0.1.5

stack.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: stack
2-
version: 1.0.4.1
2+
version: 1.0.4.2
33
synopsis: The Haskell Tool Stack
44
description: Please see the README.md for usage information, and
55
the wiki on Github for more details. Also, note that
@@ -175,7 +175,7 @@ library
175175
, mtl >= 2.1.3.1
176176
, optparse-applicative >= 0.11 && < 0.13
177177
, path >= 0.5.1
178-
, path-io >= 0.3.1 && < 1.0.0
178+
, path-io >= 1.0.0 && < 2.0.0
179179
, persistent >= 2.1.2
180180
, persistent-sqlite >= 2.1.4
181181
, persistent-template >= 2.1.1

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ nix:
1010
packages:
1111
- zlib
1212
extra-deps:
13-
- path-io-0.3.1
13+
- path-io-1.0.0
1414
- hpack-0.9.0

0 commit comments

Comments
 (0)