Skip to content

Commit 336d76e

Browse files
phadejphadej
authored
Merge pull request #611 from haskell-CI/cabal-syntax
Use Cabal-syntax
2 parents 8d980b5 + 6ad0d5d commit 336d76e

File tree

17 files changed

+54
-51
lines changed

17 files changed

+54
-51
lines changed

‎cabal-install-parsers/Changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 0.5
2+
3+
- Move to use `Cabal-syntax` package
4+
It's possible to have a build-plan with (old) `Cabal`,
5+
and new `cabal-install` syntax, which may cause
6+
`...Version` is not `...Version` like errors.
7+
18
## 0.4.5
29

310
- Resolve `.tar.gz` package files to `file:` URI-locations

‎cabal-install-parsers/cabal-install-parsers.cabal

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: cabal-install-parsers
3-
version: 0.4.5
3+
version: 0.5
44
synopsis: Utilities to work with cabal-install files
55
description:
66
@cabal-install-parsers@ provides parsers for @cabal-install@ files:
@@ -57,20 +57,20 @@ library
5757
, base >=4.10 && <4.17
5858
, binary ^>=0.8.5
5959
, bytestring ^>=0.10.8.1 || ^>=0.11.1.0
60-
, Cabal ^>=3.6.0.0
60+
, Cabal-syntax ^>=3.8.1.0
6161
, containers ^>=0.5.7.1 || ^>=0.6.0.1
6262
, deepseq ^>=1.4.2.0
6363
, directory ^>=1.3.0.0
6464
, filepath ^>=1.4.1.1
6565
, parsec ^>=3.1.13.0
6666
, pretty ^>=1.1.3.3
67-
, text ^>=1.2.3.0
68-
, time ^>=1.8.0.2 || ^>=1.9.3 || ^>=1.11.1.1
67+
, text ^>=1.2.3.0 || ^>=2.0.1
68+
, time ^>=1.8.0.2 || ^>=1.9.3 || ^>=1.11.1.1 || ^>=1.12.2
6969
, transformers ^>=0.5.2.0
7070

7171
-- extra dependencies
7272
build-depends:
73-
, aeson ^>=1.4.6.0 || ^>=1.5.0.0 || ^>=2.0.0.0
73+
, aeson ^>=2.1.0.0
7474
, base16-bytestring ^>=1.0.0.0
7575
, binary-instances ^>=1
7676
, cryptohash-sha256 ^>=0.11.101.0
@@ -92,14 +92,14 @@ test-suite cabal-parsers-index
9292
, base
9393
, base16-bytestring
9494
, bytestring
95-
, Cabal
95+
, Cabal-syntax
9696
, cabal-install-parsers
9797
, containers
9898
, tar
9999

100100
-- dependencies needing explicit constraints
101101
build-depends:
102-
, tasty ^>=1.2.3 || ^>=1.3.1 || ^>=1.4
102+
, tasty ^>=1.4
103103
, tasty-hunit ^>=0.10.0.2
104104

105105
test-suite cabal-parsers-golden
@@ -112,7 +112,7 @@ test-suite cabal-parsers-golden
112112
build-depends:
113113
, base
114114
, bytestring
115-
, Cabal
115+
, Cabal-syntax
116116
, cabal-install-parsers
117117
, containers
118118
, directory
@@ -122,7 +122,7 @@ test-suite cabal-parsers-golden
122122
-- dependencies needing explicit constraints
123123
build-depends:
124124
, ansi-terminal >=0.10 && <0.12
125-
, tasty ^>=1.2.3 || ^>=1.3.1 || ^>=1.4
125+
, tasty ^>=1.4
126126
, tasty-golden ^>=2.3.1.1
127127
, tree-diff ^>=0.2
128128

@@ -136,11 +136,11 @@ benchmark cabal-parsers-bench
136136
build-depends:
137137
, base
138138
, bytestring
139-
, Cabal
139+
, Cabal-syntax
140140
, cabal-install-parsers
141141
, containers
142142
, directory
143143
, filepath
144144

145145
-- dependencies needing explicit constraints
146-
build-depends: criterion ^>=1.5.6.1
146+
build-depends: criterion ^>=1.6.0.0

‎cabal-install-parsers/src/Cabal/Config.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ import System.Directory (getAppUserDataDirectory)
3333
import System.Environment (lookupEnv)
3434
import System.FilePath ((</>))
3535

36-
import qualified Data.ByteString as BS
37-
import qualified Data.Map.Strict as M
38-
import qualified Distribution.CabalSpecVersion as C
39-
import qualified Distribution.FieldGrammar as C
40-
import qualified Distribution.Fields as C
41-
import qualified Distribution.Parsec as C
42-
import qualified Distribution.Simple.Utils as C
36+
import qualified Data.ByteString as BS
37+
import qualified Data.Map.Strict as M
38+
import qualified Distribution.CabalSpecVersion as C
39+
import qualified Distribution.FieldGrammar as C
40+
import qualified Distribution.Fields as C
41+
import qualified Distribution.Parsec as C
42+
import qualified Distribution.Utils.Generic as C
4343

4444
import Cabal.Internal.Newtypes
4545
import Cabal.Parse

‎cabal-install-parsers/src/Cabal/Index.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module Cabal.Index (
4040
import Prelude hiding (pi)
4141

4242
import Control.Exception (Exception, IOException, bracket, evaluate, handle, throwIO)
43-
import Data.Bits (shiftL, (.|.), shiftR, (.&.))
43+
import Data.Bits (shiftL, shiftR, (.&.), (.|.))
4444
import Data.ByteString (ByteString)
4545
import Data.Int (Int64)
4646
import Data.Map.Strict (Map)
@@ -68,7 +68,7 @@ import qualified Distribution.Package as C
6868
import qualified Distribution.Parsec as C
6969
import qualified Distribution.Parsec.FieldLineStream as C
7070
import qualified Distribution.Pretty as C
71-
import qualified Distribution.Simple.Utils as C
71+
import qualified Distribution.Utils.Generic as C
7272
import qualified Distribution.Version as C
7373
import qualified Lukko
7474
import qualified System.Directory as D

‎cabal-install-parsers/src/Cabal/Parse.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ module Cabal.Parse (
1010
renderParseError,
1111
) where
1212

13-
import Control.DeepSeq (NFData (..))
14-
import Control.Exception (Exception (..))
15-
import Data.ByteString (ByteString)
16-
import Data.Foldable (for_)
17-
import Data.List.NonEmpty (NonEmpty)
18-
import Data.Typeable (Typeable)
19-
import Distribution.Simple.Utils (fromUTF8BS)
20-
import GHC.Generics (Generic)
21-
import System.FilePath (normalise)
13+
import Control.DeepSeq (NFData (..))
14+
import Control.Exception (Exception (..))
15+
import Data.ByteString (ByteString)
16+
import Data.Foldable (for_)
17+
import Data.List.NonEmpty (NonEmpty)
18+
import Data.Typeable (Typeable)
19+
import Distribution.Utils.Generic (fromUTF8BS)
20+
import GHC.Generics (Generic)
21+
import System.FilePath (normalise)
2222

2323
import qualified Data.ByteString.Char8 as BS8
2424
import qualified Distribution.Fields as C

‎cabal-install-parsers/src/Cabal/Project.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ instance (NFData c, NFData b, NFData a) => NFData (Project c b a) where
152152
rnfList f (x:xs) = f x `seq` rnfList f xs
153153

154154
rnfPrettyField :: NFData x => C.PrettyField x -> ()
155+
rnfPrettyField C.PrettyEmpty = ()
155156
rnfPrettyField (C.PrettyField ann fn d) =
156157
rnf ann `seq` rnf fn `seq` rnf d
157158
rnfPrettyField (C.PrettySection ann fn ds fs) =

‎haskell-ci.cabal

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: haskell-ci
3-
version: 0.15.20220812
3+
version: 0.15.20220821
44
synopsis: Cabal package script generator for Travis-CI
55
description:
66
Script generator (@haskell-ci@) for
@@ -136,7 +136,7 @@ library haskell-ci-internal
136136
, base >=4.10 && <4.17
137137
, binary ^>=0.8.5.1
138138
, bytestring ^>=0.10.8.1 || ^>=0.11.1.0
139-
, Cabal ^>=3.6.0.0
139+
, Cabal-syntax ^>=3.8.1.0
140140
, containers ^>=0.5.7.1 || ^>=0.6.0.1
141141
, deepseq ^>=1.4.2.0
142142
, directory ^>=1.3.0.0
@@ -145,19 +145,19 @@ library haskell-ci-internal
145145
, parsec ^>=3.1.13.0
146146
, pretty ^>=1.1.3.3
147147
, process ^>=1.4.3.0 || ^>=1.6.1.0
148-
, text ^>=1.2.3.0
148+
, text ^>=1.2.3.0 || ^>=2.0.1
149149
, transformers ^>=0.5.2.0
150150

151151
if !impl(ghc >=8.2)
152152
build-depends: bifunctors ^>=5.5.4
153153

154154
-- other dependencies
155155
build-depends:
156-
, aeson ^>=1.5.6.0 || ^>=2.0.0.0
156+
, aeson ^>=1.5.6.0 || ^>=2.0.0.0 || ^>=2.1.0.0
157157
, attoparsec ^>=0.14.1
158158
, base-compat ^>=0.11 || ^>=0.12
159159
, base16-bytestring ^>=1.0.1.0
160-
, cabal-install-parsers ^>=0.4.5
160+
, cabal-install-parsers ^>=0.5
161161
, cryptohash-sha256 ^>=0.11.101.0
162162
, exceptions ^>=0.10.0
163163
, generic-lens-lite ^>=0.1
@@ -196,7 +196,7 @@ test-suite golden
196196
, base
197197
, base-compat
198198
, bytestring
199-
, Cabal
199+
, Cabal-syntax
200200
, directory
201201
, filepath
202202
, haskell-ci-internal

‎src/HaskellCI.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import System.IO.Temp (withSystemTempFile)
3838
import System.Process (readProcessWithExitCode)
3939

4040
import Distribution.PackageDescription (GenericPackageDescription, package, packageDescription, testedWith)
41-
import Distribution.Simple.Utils (fromUTF8BS, toUTF8BS)
4241
import Distribution.Text
4342
import Distribution.Version
4443

‎src/HaskellCI/Bash.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
104104
]
105105

106106
-- extra cabal.project fields
107-
cat "cabal.project" $ C.showFields' (const []) (const id) 2 $ extraCabalProjectFields ""
107+
cat "cabal.project" $ C.showFields' (const C.NoComment) (const id) 2 $ extraCabalProjectFields ""
108108

109109
-- also write cabal.project.local file with
110110
-- @

‎src/HaskellCI/Config.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ module HaskellCI.Config where
88

99
import HaskellCI.Prelude
1010

11-
import Distribution.Simple.Utils (fromUTF8BS)
12-
1311
import qualified Data.ByteString as BS
1412
import qualified Data.Map as M
1513
import qualified Data.Set as S

0 commit comments

Comments
 (0)