git.iko.soy/Idris-dev
on master help sign in
Migrated to lts-15.3
d7a669biko
idris.cabal+6−7
compare with master
unifiedsplit
@@ -78,7 +78,7 @@ Extra-source-files:
78 stack.yaml
78 stack.yaml
79 stylize.sh
79 stylize.sh
80 win-release.sh
80 win-release.sh
81−
81+
82 benchmarks/*.pl
82 benchmarks/*.pl
83 benchmarks/**/*.idr
83 benchmarks/**/*.idr
84 benchmarks/**/*.ipkg
84 benchmarks/**/*.ipkg
@@ -304,13 +304,13 @@ Library
304 Build-depends: base >=4 && <5
304 Build-depends: base >=4 && <5
305 , aeson >= 0.6 && < 1.5
305 , aeson >= 0.6 && < 1.5
306 , annotated-wl-pprint >= 0.7 && < 0.8
306 , annotated-wl-pprint >= 0.7 && < 0.8
307− , ansi-terminal < 0.10
307+ , ansi-terminal < 0.11
308 , ansi-wl-pprint < 0.7
308 , ansi-wl-pprint < 0.7
309 , array >= 0.4.0.1 && < 0.6
309 , array >= 0.4.0.1 && < 0.6
310 , base64-bytestring < 1.1
310 , base64-bytestring < 1.1
311 , binary >= 0.8.4.1 && < 0.9
311 , binary >= 0.8.4.1 && < 0.9
312 , blaze-html >= 0.6.1.3 && < 0.10
312 , blaze-html >= 0.6.1.3 && < 0.10
313− , blaze-markup >= 0.5.2.1 && < 0.9
313+ , blaze-markup >= 0.5.2.1 && < 0.10
314 , bytestring < 0.11
314 , bytestring < 0.11
315 , cheapskate >= 0.1.1.2 && < 0.2
315 , cheapskate >= 0.1.1.2 && < 0.2
316 , code-page >= 0.1 && < 0.3
316 , code-page >= 0.1 && < 0.3
@@ -321,9 +321,9 @@ Library
321 , fingertree >= 0.1.4.1 && < 0.2
321 , fingertree >= 0.1.4.1 && < 0.2
322 , haskeline >= 0.7 && < 0.8
322 , haskeline >= 0.7 && < 0.8
323 , ieee754 >= 0.7 && < 0.9
323 , ieee754 >= 0.7 && < 0.9
324− , megaparsec >= 7.0.4 && < 8
324+ , megaparsec >= 8 && < 9
325 , mtl >= 2.1 && < 2.3
325 , mtl >= 2.1 && < 2.3
326− , network >= 2.7 && < 2.9
326+ , network >= 2.7 && < 3.1.2
327 , optparse-applicative >= 0.13 && < 0.16
327 , optparse-applicative >= 0.13 && < 0.16
328 , parser-combinators >= 1.0.0
328 , parser-combinators >= 1.0.0
329 , pretty < 1.2
329 , pretty < 1.2
@@ -341,7 +341,7 @@ Library
341 , vector < 0.13
341 , vector < 0.13
342 , vector-binary-instances < 0.3
342 , vector-binary-instances < 0.3
343 , zip-archive > 0.2.3.5 && < 0.5
343 , zip-archive > 0.2.3.5 && < 0.5
344− , fsnotify >= 0.2 && < 2.2
344+ , fsnotify >= 0.2 && < 0.4
345 , async < 2.3
345 , async < 2.3
346
346
347 if !impl(ghc >= 8.0)
347 if !impl(ghc >= 8.0)
@@ -459,4 +459,3 @@ Executable idris-codegen-node
459 Default-Language: Haskell2010
459 Default-Language: Haskell2010
460 ghc-prof-options: -auto-all -caf-all
460 ghc-prof-options: -auto-all -caf-all
461 ghc-options: -threaded -rtsopts -funbox-strict-fields
461 ghc-options: -threaded -rtsopts -funbox-strict-fields
462−
src/Idris/Parser/Stack.hs+4−3
@@ -77,11 +77,12 @@ parseErrorOffset = P.errorOffset . parseError
77instance Message ParseError where
77instance Message ParseError where
78 messageExtent err = sourcePositionFC pos
78 messageExtent err = sourcePositionFC pos
79 where
79 where
80+ P.PosState {P.pstateSourcePos = pos} =
80− (pos, _) = P.reachOffsetNoLine (parseErrorOffset err) (parseErrorPosState err)
81+ P.reachOffsetNoLine (parseErrorOffset err) (parseErrorPosState err)
81 messageText = PP.text . init . P.parseErrorTextPretty . parseError
82 messageText = PP.text . init . P.parseErrorTextPretty . parseError
82 messageSource err = Just sline
83 messageSource err = Just sline
83 where
84 where
84− (_, sline, _) = P.reachOffset (parseErrorOffset err) (parseErrorPosState err)
85+ (sline, _) = P.reachOffset (parseErrorOffset err) (parseErrorPosState err)
85
86
86-- | A fully formatted parse error, with caret and bar, etc.
87-- | A fully formatted parse error, with caret and bar, etc.
87prettyError :: ParseError -> String
88prettyError :: ParseError -> String
@@ -89,7 +90,7 @@ prettyError = P.errorBundlePretty . unParseError
89
90
90{- * Mark and restore -}
91{- * Mark and restore -}
91
92
92−type Mark = P.State String
93+type Mark = P.State String Void
93
94
94-- | Retrieve the parser state so we can restart from this point later.
95-- | Retrieve the parser state so we can restart from this point later.
95mark :: Parsing m => m Mark
96mark :: Parsing m => m Mark
stack-alt.yamldeleted−25
@@ -1,25 +0,0 @@
1−#recheck extra-deps next on resolver or cabal file change
2−resolver: lts-11.4
3−
4−packages:
5− - location: .
6−
7−extra-deps:
8− - network-2.8.0.0@sha256:aae171e6c6028a7791dbe4de5b9d2da398056359e3cc7927465ffa3cdae1aa0b
9− - Cabal-2.2.0.1@sha256:2a80d8fb655474f0eaeb20434c47f64f84e6302e55973056f00df8ca050b9683
10− - megaparsec-7.0.4
11− - parser-combinators-1.0.0
12− - zip-archive-0.3.3@sha256:47cf2d66cc8e237f7226837758e1b041e24048ef3820d3d10276c500edb921bf
13− - containers-0.5.11.0@sha256:28ad7337057442f75bc689315ab4ec7bdf5e6b2c39668f306672cecd82c02798
14−
15−flags:
16− idris:
17− FFI: true
18− GMP: true
19−
20−ghc-options:
21− idris: -fwarn-unused-imports -fwarn-unused-binds
22−
23−nix:
24− enable: false
25− shell-file: stack-shell.nix
stack.yaml+2−11
@@ -1,17 +1,8 @@
1#recheck extra-deps next on resolver or cabal file change
1#recheck extra-deps next on resolver or cabal file change
2−resolver: lts-13.21
2+resolver: lts-15.3
3
3
4extra-deps:
4extra-deps:
5− - network-2.8.0.0@sha256:aae171e6c6028a7791dbe4de5b9d2da398056359e3cc7927465ffa3cdae1aa0b
5+- cheapskate-0.1.1.2
6− - megaparsec-7.0.4
7− - parser-combinators-1.0.0
8− - zip-archive-0.3.3@sha256:47cf2d66cc8e237f7226837758e1b041e24048ef3820d3d10276c500edb921bf
9− - containers-0.5.11.0@sha256:28ad7337057442f75bc689315ab4ec7bdf5e6b2c39668f306672cecd82c02798
10− - tasty-rerun-1.1.14@sha256:ba9c19a281535bea566e1044bc02c36ef17abcb310af4b6a149ec11780c7ce35
11− - binary-0.8.7.0@sha256:ae3e6cca723ac55c54bbb3fa771bcf18142bc727afd57818e66d6ee6c8044f12
12− - text-1.2.4.0@sha256:8c24450feb8e3bbb7ea3e17af24ef57e85db077c4bf53e5bcc345b283d1b1d5b
13− - HsYAML-0.2.1.0@sha256:e4677daeba57f7a1e9a709a1f3022fe937336c91513e893166bd1f023f530d68,5311
14− - HsYAML-aeson-0.2.0.0@sha256:04796abfc01cffded83f37a10e6edba4f0c0a15d45bef44fc5bb4313d9c87757,1791
15
6
16flags:
7flags:
17 idris:
8 idris: