Merge pull request #105 from con-kitty/cabal-file-improvements

Cabal file improvements
con-kitty · Feb 7, 2024 · 69516c0 · 69516c0
2 parents 38be6a1 + c90feb9
commit 69516c0
Show file tree

Hide file tree

Showing 34 changed files with 998 additions and 1,210 deletions.
diff --git a/cabal.project b/cabal.project
@@ -2,34 +2,15 @@ source-repository-package
   type: git
   location: https://github.com/compiling-to-categories/concat.git
   tag: d95c79d23f2728f2ab50497760195fffaf4ba675
-  subdir: classes
-
-source-repository-package
-  type: git
-  location: https://github.com/compiling-to-categories/concat.git
-  tag: d95c79d23f2728f2ab50497760195fffaf4ba675
-  subdir: examples
-
--- dependency of concat-classes, concat-examples
-source-repository-package
-  type: git
-  location: https://github.com/compiling-to-categories/concat.git
-  tag: d95c79d23f2728f2ab50497760195fffaf4ba675
-  subdir: inline
-
--- dependency of concat-classes, concat-examples
-source-repository-package
-  type: git
-  location: https://github.com/compiling-to-categories/concat.git
-  tag: d95c79d23f2728f2ab50497760195fffaf4ba675
-  subdir: known
-
--- dependency of concat-classes
-source-repository-package
-  type: git
-  location: https://github.com/compiling-to-categories/concat.git
-  tag: d95c79d23f2728f2ab50497760195fffaf4ba675
-  subdir: satisfy
+  subdir:
+    classes
+    examples
+    -- dependency of concat-classes, concat-examples
+    inline
+    -- dependency of concat-classes, concat-examples
+    known
+    -- dependency of concat-classes
+    satisfy
 
 program-options
   ghc-options: -Werror

diff --git a/category/categorifier-category.cabal b/category/categorifier-category.cabal
@@ -12,7 +12,32 @@ source-repository head
   type: git
   location: https://github.com/con-kitty/categorifier
 
+common defaults
+  ghc-options:
+    -Wall
+  build-depends:
+    , base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
+  default-language: Haskell2010
+  default-extensions:
+    BangPatterns
+    DeriveDataTypeable
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveTraversable
+    DerivingStrategies
+    FlexibleContexts
+    FlexibleInstances
+    FunctionalDependencies
+    InstanceSigs
+    LambdaCase
+    ScopedTypeVariables
+    StandaloneDeriving
+    TypeApplications
+    TypeOperators
+
 library
+  import: defaults
   exposed-modules:
       Categorifier.Category
   other-modules:
@@ -23,23 +48,4 @@ library
     -O2
     -Wall
   build-depends:
-    , base >=4.13.0 && <4.17
     , categorifier-client
-  default-language: Haskell2010
-  default-extensions:
-      InstanceSigs
-    , ScopedTypeVariables
-    , TypeApplications
-    , FlexibleContexts
-    , FlexibleInstances
-    , FunctionalDependencies
-    , LambdaCase
-    , TypeOperators
-    , BangPatterns
-    , StandaloneDeriving
-    , DeriveGeneric
-    , DeriveDataTypeable
-    , DeriveFunctor
-    , DeriveFoldable
-    , DeriveTraversable
-    , DerivingStrategies
diff --git a/client/categorifier-client.cabal b/client/categorifier-client.cabal
@@ -12,67 +12,54 @@ source-repository head
   type: git
   location: https://github.com/con-kitty/categorifier
 
+common defaults
+  ghc-options:
+    -Wall
+  build-depends:
+    , base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
+    , constraints ^>=0.12.0 || ^>=0.13.0
+  default-language: Haskell2010
+  default-extensions:
+    BangPatterns
+    DeriveDataTypeable
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveTraversable
+    DerivingStrategies
+    FlexibleContexts
+    FlexibleInstances
+    FunctionalDependencies
+    InstanceSigs
+    LambdaCase
+    ScopedTypeVariables
+    StandaloneDeriving
+    TypeApplications
+    TypeOperators
+
 library
+  import: defaults
   exposed-modules:
       Categorifier.Client
   other-modules:
       Categorifier.Client.Internal
       Paths_categorifier_client
   autogen-modules:
       Paths_categorifier_client
-  ghc-options: -Wall
   build-depends:
-    , PyF >=0.9.0 && <0.12
-    , base >=4.13.0 && <4.17
+    , PyF ^>=0.9.0 || ^>=0.10.0 || ^>=0.11.0
     , categorifier-common
     , categorifier-duoids
     , categorifier-th
-    , constraints >=0.12 && <0.14
-    , extra >=1.7.8 && <1.8
-  default-language: Haskell2010
-  default-extensions:
-      InstanceSigs
-    , ScopedTypeVariables
-    , TypeApplications
-    , FlexibleContexts
-    , FlexibleInstances
-    , FunctionalDependencies
-    , LambdaCase
-    , TypeOperators
-    , BangPatterns
-    , StandaloneDeriving
-    , DeriveGeneric
-    , DeriveDataTypeable
-    , DeriveFunctor
-    , DeriveFoldable
-    , DeriveTraversable
-    , DerivingStrategies
+    , extra ^>=1.7.8
 
 test-suite client-instances
+  import: defaults
   type: exitcode-stdio-1.0
   hs-source-dirs: test
   main-is: Main.hs
   build-depends:
-    , base >=4.13.0 && <4.17
     , categorifier-client
     , categorifier-hedgehog
-    , constraints >=0.12 && <0.14
-    , fin >=0.1.1 && <0.4
-    , hedgehog >=1.0.3 && <1.3
-  default-extensions:
-      InstanceSigs
-    , ScopedTypeVariables
-    , TypeApplications
-    , FlexibleContexts
-    , FlexibleInstances
-    , FunctionalDependencies
-    , LambdaCase
-    , TypeOperators
-    , BangPatterns
-    , StandaloneDeriving
-    , DeriveGeneric
-    , DeriveDataTypeable
-    , DeriveFunctor
-    , DeriveFoldable
-    , DeriveTraversable
-    , DerivingStrategies
+    , fin ^>=0.1.1 || ^>=0.2 || ^>=0.3
+    , hedgehog ^>=1.0.3 || ^>=1.1 || ^>=1.2
diff --git a/common/categorifier-common.cabal b/common/categorifier-common.cabal
@@ -12,33 +12,38 @@ source-repository head
   type: git
   location: https://github.com/con-kitty/categorifier
 
+common defaults
+  ghc-options:
+    -Wall
+  build-depends:
+    , base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
+  default-language: Haskell2010
+  default-extensions:
+    BangPatterns
+    DeriveDataTypeable
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveTraversable
+    DerivingStrategies
+    FlexibleContexts
+    FlexibleInstances
+    FunctionalDependencies
+    InstanceSigs
+    LambdaCase
+    ScopedTypeVariables
+    StandaloneDeriving
+    TypeApplications
+    TypeOperators
+
 library
+  import: defaults
   exposed-modules:
       Categorifier.Common.IO.Exception
   other-modules:
       Paths_categorifier_common
   autogen-modules:
       Paths_categorifier_common
-  ghc-options: -Wall
   build-depends:
-    , PyF >=0.9.0 && <0.12
-    , base >=4.13.0 && <4.17
-    , unliftio >=0.2.13 && <0.3
-  default-language: Haskell2010
-  default-extensions:
-      InstanceSigs
-    , ScopedTypeVariables
-    , TypeApplications
-    , FlexibleContexts
-    , FlexibleInstances
-    , FunctionalDependencies
-    , LambdaCase
-    , TypeOperators
-    , BangPatterns
-    , StandaloneDeriving
-    , DeriveGeneric
-    , DeriveDataTypeable
-    , DeriveFunctor
-    , DeriveFoldable
-    , DeriveTraversable
-    , DerivingStrategies
+    , PyF ^>=0.9.0 || ^>=0.10.0 || ^>=0.11.0
+    , unliftio ^>=0.2.13
diff --git a/duoids/categorifier-duoids.cabal b/duoids/categorifier-duoids.cabal
@@ -12,33 +12,38 @@ source-repository head
   type: git
   location: https://github.com/con-kitty/categorifier
 
+common defaults
+  ghc-options:
+    -Wall
+  build-depends:
+    , base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
+  default-language: Haskell2010
+  default-extensions:
+    BangPatterns
+    DeriveDataTypeable
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveTraversable
+    DerivingStrategies
+    FlexibleContexts
+    FlexibleInstances
+    FunctionalDependencies
+    InstanceSigs
+    LambdaCase
+    ScopedTypeVariables
+    StandaloneDeriving
+    TypeApplications
+    TypeOperators
+
 library
+  import: defaults
   exposed-modules:
       Categorifier.Duoidal
       Categorifier.Duoidal.Either
   other-modules:
       Paths_categorifier_duoids
   autogen-modules:
       Paths_categorifier_duoids
-  ghc-options: -Wall
   build-depends:
-    , base >=4.13.0 && <4.17
-    , transformers >=0.5.6 && <0.7
-  default-language: Haskell2010
-  default-extensions:
-      InstanceSigs
-    , ScopedTypeVariables
-    , TypeApplications
-    , FlexibleContexts
-    , FlexibleInstances
-    , FunctionalDependencies
-    , LambdaCase
-    , TypeOperators
-    , BangPatterns
-    , StandaloneDeriving
-    , DeriveGeneric
-    , DeriveDataTypeable
-    , DeriveFunctor
-    , DeriveFoldable
-    , DeriveTraversable
-    , DerivingStrategies
+    , transformers ^>=0.5.6 || ^>=0.6.0
diff --git a/ghc/categorifier-ghc.cabal b/ghc/categorifier-ghc.cabal
@@ -12,7 +12,32 @@ source-repository head
   type: git
   location: https://github.com/con-kitty/categorifier
 
+common defaults
+  ghc-options:
+    -Wall
+  build-depends:
+    , base ^>=4.13.0 || ^>=4.14.0 || ^>=4.15.0 || ^>=4.16.0
+  default-language: Haskell2010
+  default-extensions:
+    BangPatterns
+    DeriveDataTypeable
+    DeriveFoldable
+    DeriveFunctor
+    DeriveGeneric
+    DeriveTraversable
+    DerivingStrategies
+    FlexibleContexts
+    FlexibleInstances
+    FunctionalDependencies
+    InstanceSigs
+    LambdaCase
+    ScopedTypeVariables
+    StandaloneDeriving
+    TypeApplications
+    TypeOperators
+
 library
+  import: defaults
   exposed-modules:
       Categorifier.GHC.Builtin
       Categorifier.GHC.Core
@@ -31,28 +56,8 @@ library
   ghc-options:
     -O2
     -fignore-interface-pragmas
-    -Wall
   build-depends:
-    , PyF >=0.9.0 && <0.12
-    , base >=4.13.0 && <4.17
-    , bytestring >=0.10.9 && <0.12
-    , containers >=0.6.2 && <0.7
-    , ghc >=8.8.1 && <9.4
-  default-language: Haskell2010
-  default-extensions:
-      InstanceSigs
-    , ScopedTypeVariables
-    , TypeApplications
-    , FlexibleContexts
-    , FlexibleInstances
-    , FunctionalDependencies
-    , LambdaCase
-    , TypeOperators
-    , BangPatterns
-    , StandaloneDeriving
-    , DeriveGeneric
-    , DeriveDataTypeable
-    , DeriveFunctor
-    , DeriveFoldable
-    , DeriveTraversable
-    , DerivingStrategies
+    , PyF ^>=0.9.0 || ^>=0.10.0 || ^>=0.11.0
+    , bytestring ^>=0.10.9 || ^>=0.11.0
+    , containers ^>=0.6.2
+    , ghc ^>=8.8.1 || ^>=8.10.1 || ^>=9.0.1 || ^>=9.2.1