Skip to content

Commit 69516c0

Browse files
selloutsellout
authored
Merge pull request #105 from con-kitty/cabal-file-improvements
Cabal file improvements
2 parents 38be6a1 + c90feb9 commit 69516c0

File tree

34 files changed

+998
-1210
lines changed

34 files changed

+998
-1210
lines changed

‎cabal.project

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,15 @@ source-repository-package
22
type: git
33
location: https://github.com/compiling-to-categories/concat.git
44
tag: d95c79d23f2728f2ab50497760195fffaf4ba675
5-
subdir: classes
6-
7-
source-repository-package
8-
type: git
9-
location: https://github.com/compiling-to-categories/concat.git
10-
tag: d95c79d23f2728f2ab50497760195fffaf4ba675
11-
subdir: examples
12-
13-
-- dependency of concat-classes, concat-examples
14-
source-repository-package
15-
type: git
16-
location: https://github.com/compiling-to-categories/concat.git
17-
tag: d95c79d23f2728f2ab50497760195fffaf4ba675
18-
subdir: inline
19-
20-
-- dependency of concat-classes, concat-examples
21-
source-repository-package
22-
type: git
23-
location: https://github.com/compiling-to-categories/concat.git
24-
tag: d95c79d23f2728f2ab50497760195fffaf4ba675
25-
subdir: known
26-
27-
-- dependency of concat-classes
28-
source-repository-package
29-
type: git
30-
location: https://github.com/compiling-to-categories/concat.git
31-
tag: d95c79d23f2728f2ab50497760195fffaf4ba675
32-
subdir: satisfy
5+
subdir:
6+
classes
7+
examples
8+
-- dependency of concat-classes, concat-examples
9+
inline
10+
-- dependency of concat-classes, concat-examples
11+
known
12+
-- dependency of concat-classes
13+
satisfy
3314

3415
program-options
3516
ghc-options: -Werror

‎category/categorifier-category.cabal

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,32 @@ source-repository head
1212
type: git
1313
location: https://github.com/con-kitty/categorifier
1414

15+
common defaults
16+
ghc-options:
17+
-Wall
18+
build-depends:
19+
, base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
20+
default-language: Haskell2010
21+
default-extensions:
22+
BangPatterns
23+
DeriveDataTypeable
24+
DeriveFoldable
25+
DeriveFunctor
26+
DeriveGeneric
27+
DeriveTraversable
28+
DerivingStrategies
29+
FlexibleContexts
30+
FlexibleInstances
31+
FunctionalDependencies
32+
InstanceSigs
33+
LambdaCase
34+
ScopedTypeVariables
35+
StandaloneDeriving
36+
TypeApplications
37+
TypeOperators
38+
1539
library
40+
import: defaults
1641
exposed-modules:
1742
Categorifier.Category
1843
other-modules:
@@ -23,23 +48,4 @@ library
2348
-O2
2449
-Wall
2550
build-depends:
26-
, base >=4.13.0 && <4.17
2751
, categorifier-client
28-
default-language: Haskell2010
29-
default-extensions:
30-
InstanceSigs
31-
, ScopedTypeVariables
32-
, TypeApplications
33-
, FlexibleContexts
34-
, FlexibleInstances
35-
, FunctionalDependencies
36-
, LambdaCase
37-
, TypeOperators
38-
, BangPatterns
39-
, StandaloneDeriving
40-
, DeriveGeneric
41-
, DeriveDataTypeable
42-
, DeriveFunctor
43-
, DeriveFoldable
44-
, DeriveTraversable
45-
, DerivingStrategies

‎client/categorifier-client.cabal

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -12,67 +12,54 @@ source-repository head
1212
type: git
1313
location: https://github.com/con-kitty/categorifier
1414

15+
common defaults
16+
ghc-options:
17+
-Wall
18+
build-depends:
19+
, base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
20+
, constraints ^>=0.12.0 || ^>=0.13.0
21+
default-language: Haskell2010
22+
default-extensions:
23+
BangPatterns
24+
DeriveDataTypeable
25+
DeriveFoldable
26+
DeriveFunctor
27+
DeriveGeneric
28+
DeriveTraversable
29+
DerivingStrategies
30+
FlexibleContexts
31+
FlexibleInstances
32+
FunctionalDependencies
33+
InstanceSigs
34+
LambdaCase
35+
ScopedTypeVariables
36+
StandaloneDeriving
37+
TypeApplications
38+
TypeOperators
39+
1540
library
41+
import: defaults
1642
exposed-modules:
1743
Categorifier.Client
1844
other-modules:
1945
Categorifier.Client.Internal
2046
Paths_categorifier_client
2147
autogen-modules:
2248
Paths_categorifier_client
23-
ghc-options: -Wall
2449
build-depends:
25-
, PyF >=0.9.0 && <0.12
26-
, base >=4.13.0 && <4.17
50+
, PyF ^>=0.9.0 || ^>=0.10.0 || ^>=0.11.0
2751
, categorifier-common
2852
, categorifier-duoids
2953
, categorifier-th
30-
, constraints >=0.12 && <0.14
31-
, extra >=1.7.8 && <1.8
32-
default-language: Haskell2010
33-
default-extensions:
34-
InstanceSigs
35-
, ScopedTypeVariables
36-
, TypeApplications
37-
, FlexibleContexts
38-
, FlexibleInstances
39-
, FunctionalDependencies
40-
, LambdaCase
41-
, TypeOperators
42-
, BangPatterns
43-
, StandaloneDeriving
44-
, DeriveGeneric
45-
, DeriveDataTypeable
46-
, DeriveFunctor
47-
, DeriveFoldable
48-
, DeriveTraversable
49-
, DerivingStrategies
54+
, extra ^>=1.7.8
5055

5156
test-suite client-instances
57+
import: defaults
5258
type: exitcode-stdio-1.0
5359
hs-source-dirs: test
5460
main-is: Main.hs
5561
build-depends:
56-
, base >=4.13.0 && <4.17
5762
, categorifier-client
5863
, categorifier-hedgehog
59-
, constraints >=0.12 && <0.14
60-
, fin >=0.1.1 && <0.4
61-
, hedgehog >=1.0.3 && <1.3
62-
default-extensions:
63-
InstanceSigs
64-
, ScopedTypeVariables
65-
, TypeApplications
66-
, FlexibleContexts
67-
, FlexibleInstances
68-
, FunctionalDependencies
69-
, LambdaCase
70-
, TypeOperators
71-
, BangPatterns
72-
, StandaloneDeriving
73-
, DeriveGeneric
74-
, DeriveDataTypeable
75-
, DeriveFunctor
76-
, DeriveFoldable
77-
, DeriveTraversable
78-
, DerivingStrategies
64+
, fin ^>=0.1.1 || ^>=0.2 || ^>=0.3
65+
, hedgehog ^>=1.0.3 || ^>=1.1 || ^>=1.2

‎common/categorifier-common.cabal

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,38 @@ source-repository head
1212
type: git
1313
location: https://github.com/con-kitty/categorifier
1414

15+
common defaults
16+
ghc-options:
17+
-Wall
18+
build-depends:
19+
, base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
20+
default-language: Haskell2010
21+
default-extensions:
22+
BangPatterns
23+
DeriveDataTypeable
24+
DeriveFoldable
25+
DeriveFunctor
26+
DeriveGeneric
27+
DeriveTraversable
28+
DerivingStrategies
29+
FlexibleContexts
30+
FlexibleInstances
31+
FunctionalDependencies
32+
InstanceSigs
33+
LambdaCase
34+
ScopedTypeVariables
35+
StandaloneDeriving
36+
TypeApplications
37+
TypeOperators
38+
1539
library
40+
import: defaults
1641
exposed-modules:
1742
Categorifier.Common.IO.Exception
1843
other-modules:
1944
Paths_categorifier_common
2045
autogen-modules:
2146
Paths_categorifier_common
22-
ghc-options: -Wall
2347
build-depends:
24-
, PyF >=0.9.0 && <0.12
25-
, base >=4.13.0 && <4.17
26-
, unliftio >=0.2.13 && <0.3
27-
default-language: Haskell2010
28-
default-extensions:
29-
InstanceSigs
30-
, ScopedTypeVariables
31-
, TypeApplications
32-
, FlexibleContexts
33-
, FlexibleInstances
34-
, FunctionalDependencies
35-
, LambdaCase
36-
, TypeOperators
37-
, BangPatterns
38-
, StandaloneDeriving
39-
, DeriveGeneric
40-
, DeriveDataTypeable
41-
, DeriveFunctor
42-
, DeriveFoldable
43-
, DeriveTraversable
44-
, DerivingStrategies
48+
, PyF ^>=0.9.0 || ^>=0.10.0 || ^>=0.11.0
49+
, unliftio ^>=0.2.13

‎duoids/categorifier-duoids.cabal

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,38 @@ source-repository head
1212
type: git
1313
location: https://github.com/con-kitty/categorifier
1414

15+
common defaults
16+
ghc-options:
17+
-Wall
18+
build-depends:
19+
, base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
20+
default-language: Haskell2010
21+
default-extensions:
22+
BangPatterns
23+
DeriveDataTypeable
24+
DeriveFoldable
25+
DeriveFunctor
26+
DeriveGeneric
27+
DeriveTraversable
28+
DerivingStrategies
29+
FlexibleContexts
30+
FlexibleInstances
31+
FunctionalDependencies
32+
InstanceSigs
33+
LambdaCase
34+
ScopedTypeVariables
35+
StandaloneDeriving
36+
TypeApplications
37+
TypeOperators
38+
1539
library
40+
import: defaults
1641
exposed-modules:
1742
Categorifier.Duoidal
1843
Categorifier.Duoidal.Either
1944
other-modules:
2045
Paths_categorifier_duoids
2146
autogen-modules:
2247
Paths_categorifier_duoids
23-
ghc-options: -Wall
2448
build-depends:
25-
, base >=4.13.0 && <4.17
26-
, transformers >=0.5.6 && <0.7
27-
default-language: Haskell2010
28-
default-extensions:
29-
InstanceSigs
30-
, ScopedTypeVariables
31-
, TypeApplications
32-
, FlexibleContexts
33-
, FlexibleInstances
34-
, FunctionalDependencies
35-
, LambdaCase
36-
, TypeOperators
37-
, BangPatterns
38-
, StandaloneDeriving
39-
, DeriveGeneric
40-
, DeriveDataTypeable
41-
, DeriveFunctor
42-
, DeriveFoldable
43-
, DeriveTraversable
44-
, DerivingStrategies
49+
, transformers ^>=0.5.6 || ^>=0.6.0

‎ghc/categorifier-ghc.cabal

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,32 @@ source-repository head
1212
type: git
1313
location: https://github.com/con-kitty/categorifier
1414

15+
common defaults
16+
ghc-options:
17+
-Wall
18+
build-depends:
19+
, base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
20+
default-language: Haskell2010
21+
default-extensions:
22+
BangPatterns
23+
DeriveDataTypeable
24+
DeriveFoldable
25+
DeriveFunctor
26+
DeriveGeneric
27+
DeriveTraversable
28+
DerivingStrategies
29+
FlexibleContexts
30+
FlexibleInstances
31+
FunctionalDependencies
32+
InstanceSigs
33+
LambdaCase
34+
ScopedTypeVariables
35+
StandaloneDeriving
36+
TypeApplications
37+
TypeOperators
38+
1539
library
40+
import: defaults
1641
exposed-modules:
1742
Categorifier.GHC.Builtin
1843
Categorifier.GHC.Core
@@ -31,28 +56,8 @@ library
3156
ghc-options:
3257
-O2
3358
-fignore-interface-pragmas
34-
-Wall
3559
build-depends:
36-
, PyF >=0.9.0 && <0.12
37-
, base >=4.13.0 && <4.17
38-
, bytestring >=0.10.9 && <0.12
39-
, containers >=0.6.2 && <0.7
40-
, ghc >=8.8.1 && <9.4
41-
default-language: Haskell2010
42-
default-extensions:
43-
InstanceSigs
44-
, ScopedTypeVariables
45-
, TypeApplications
46-
, FlexibleContexts
47-
, FlexibleInstances
48-
, FunctionalDependencies
49-
, LambdaCase
50-
, TypeOperators
51-
, BangPatterns
52-
, StandaloneDeriving
53-
, DeriveGeneric
54-
, DeriveDataTypeable
55-
, DeriveFunctor
56-
, DeriveFoldable
57-
, DeriveTraversable
58-
, DerivingStrategies
60+
, PyF ^>=0.9.0 || ^>=0.10.0 || ^>=0.11.0
61+
, bytestring ^>=0.10.9 || ^>=0.11.0
62+
, containers ^>=0.6.2
63+
, ghc ^>=8.8.1 || ^>=8.10.1 || ^>=9.0.1 || ^>=9.2.1

0 commit comments

Comments
 (0)