Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bumping resolver from 5.15 to 12.7 + fixes
  • Loading branch information
EarlGray committed Aug 27, 2018
1 parent d0de49b commit a7870be
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Main.hs
Expand Up @@ -244,7 +244,7 @@ fsTreeFromDir path dir ignored = FSDir dir <$> catMaybes <$> (mapM fstreefy =<<
then return Nothing else do
st <- getFileStatus (path </> dir </> name)
case st of
_ | isRegularFile st || isSymbolicLink st -> return $ Just $ FSFile name
_ | isRegularFile st || Posix.isSymbolicLink st -> return $ Just $ FSFile name
_ | isDirectory st -> Just <$> fsTreeFromDir (path </> dir) name ignored
_ -> return Nothing

Expand Down Expand Up @@ -442,7 +442,7 @@ main = do
s <- getFileStatus path
(blob, mod) <- case s of
_ | isRegularFile s -> (, bool 0o100755 0o100644 (fileMode s `testBit` 6)) <$> BL.readFile path
_ | isSymbolicLink s -> (, 0o120000) <$> BLU.fromString <$> Posix.readSymbolicLink path
_ | Posix.isSymbolicLink s -> (, 0o120000) <$> BLU.fromString <$> Posix.readSymbolicLink path
_ -> error ("not a valid file to add: " ++ rpath)
sha <- writeBlob gitdir idxmaps "blob" blob
let fname = PF.makeRelative workdir path
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
@@ -1,4 +1,4 @@
resolver: lts-5.15
resolver: lts-12.7
packages:
- '.'
extra-deps: []
Expand Down

0 comments on commit a7870be

Please sign in to comment.