Upgrade all cabal files to version 3.0

haskell-distributed · Aug 31, 2024 · aef4a6c · aef4a6c
1 parent 0e571e2
commit aef4a6c
Show file tree

Hide file tree

Showing 36 changed files with 90 additions and 89 deletions.
diff --git a/packages/distributed-process-async/distributed-process-async.cabal b/packages/distributed-process-async/distributed-process-async.cabal
@@ -1,8 +1,8 @@
+cabal-version:  3.0
 name:           distributed-process-async
 version:        0.2.7
-cabal-version:  >=1.10
 build-type:     Simple
-license:        BSD3
+license:        BSD-3-Clause
 license-file:   LICENCE
 stability:      experimental
 Copyright:      Tim Watson 2012 - 2016

diff --git a/packages/distributed-process-client-server/distributed-process-client-server.cabal b/packages/distributed-process-client-server/distributed-process-client-server.cabal
@@ -1,8 +1,8 @@
+cabal-version:  3.0
 name:           distributed-process-client-server
 version:        0.2.5.1
-cabal-version:  >=1.8
 build-type:     Simple
-license:        BSD3
+license:        BSD-3-Clause
 license-file:   LICENCE
 stability:      experimental
 Copyright:      Tim Watson 2012 - 2017
@@ -17,7 +17,6 @@ description:    Modelled after Erlang OTP's gen_server, this framework provides
                 concurrent, distributed applications with relative ease.
 category:       Control
 Tested-With:    GHC==8.2.2
-data-dir:       ""
 
 source-repository head
   type:      git
@@ -45,7 +44,6 @@ library
                      derive == 2.5.5,
                      uniplate == 1.6.12,
                      ghc-prim
-  extensions:      CPP
   hs-source-dirs:   src
   ghc-options:      -Wall
   exposed-modules:
@@ -96,7 +94,6 @@ test-suite ManagedProcessTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
-  extensions:      CPP
   main-is:         TestManagedProcess.hs
 
 test-suite PrioritisedProcessTests
@@ -131,5 +128,4 @@ test-suite PrioritisedProcessTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
-  extensions:      CPP
   main-is:         TestPrioritisedProcess.hs
diff --git a/packages/distributed-process-client-server/tests/ManagedProcessCommon.hs b/packages/distributed-process-client-server/tests/ManagedProcessCommon.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE FlexibleInstances   #-}
 {-# LANGUAGE RecordWildCards     #-}

diff --git a/packages/distributed-process-client-server/tests/TestManagedProcess.hs b/packages/distributed-process-client-server/tests/TestManagedProcess.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP  #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE RecordWildCards     #-}
 

diff --git a/packages/distributed-process-client-server/tests/TestPrioritisedProcess.hs b/packages/distributed-process-client-server/tests/TestPrioritisedProcess.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE DeriveGeneric       #-}

diff --git a/packages/distributed-process-execution/distributed-process-execution.cabal b/packages/distributed-process-execution/distributed-process-execution.cabal
@@ -1,14 +1,13 @@
+cabal-version:  3.0
 name:           distributed-process-execution
 version:        0.1.2.2
-cabal-version:  >=1.8
 build-type:     Simple
-license:        BSD3
+license:        BSD-3-Clause
 license-file:   LICENCE
 stability:      experimental
 Copyright:      Tim Watson 2012 - 2013
 Author:         Tim Watson
 Maintainer:     Tim Watson <[email protected]>
-Stability:      experimental
 Homepage:       http://github.com/haskell-distributed/distributed-process-execution
 Bug-Reports:    http://github.com/haskell-distributed/distributed-process-execution/issues
 synopsis:       Execution Framework for The Cloud Haskell Application Platform
@@ -18,7 +17,6 @@ description:
                 for event management, mailbox buffering and message routing.
 category:       Control
 tested-with:    GHC == 7.4.2 GHC == 7.6.2
-data-dir:       ""
 extra-source-files: ChangeLog
 
 source-repository head
@@ -48,7 +46,6 @@ library
                      derive == 2.5.5,
                      uniplate == 1.6.12,
                      ghc-prim
-  extensions:      CPP
   hs-source-dirs:   src
   ghc-options:      -Wall
   exposed-modules:
@@ -98,7 +95,6 @@ test-suite ExchangeTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind -eventlog
-  extensions:      CPP
   main-is:         TestExchange.hs
 
 
@@ -138,6 +134,5 @@ test-suite MailboxTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind -eventlog
-  extensions:      CPP
   main-is:         TestMailbox.hs
   other-modules:   MailboxTestFilters
diff --git a/packages/distributed-process-execution/src/Control/Distributed/Process/Execution/Mailbox.hs b/packages/distributed-process-execution/src/Control/Distributed/Process/Execution/Mailbox.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DeriveDataTypeable   #-}
 {-# LANGUAGE DeriveGeneric        #-}
 {-# LANGUAGE StandaloneDeriving   #-}

diff --git a/packages/distributed-process-execution/tests/MailboxTestFilters.hs b/packages/distributed-process-execution/tests/MailboxTestFilters.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 

diff --git a/packages/distributed-process-execution/tests/TestExchange.hs b/packages/distributed-process-execution/tests/TestExchange.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE BangPatterns          #-}
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}

diff --git a/packages/distributed-process-execution/tests/TestMailbox.hs b/packages/distributed-process-execution/tests/TestMailbox.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 

diff --git a/packages/distributed-process-extras/distributed-process-extras.cabal b/packages/distributed-process-extras/distributed-process-extras.cabal
@@ -1,8 +1,8 @@
+cabal-version:  3.0
 name:           distributed-process-extras
 version:        0.3.5
-cabal-version:  >=1.8
 build-type:     Simple
-license:        BSD3
+license:        BSD-3-Clause
 license-file:   LICENCE
 stability:      experimental
 Copyright:      Tim Watson 2012 - 2017
@@ -15,7 +15,6 @@ description:    Supporting library, providing common types and utilities used by
                 various libraries built on top of distributed-process
 category:       Control
 Tested-With:    GHC==7.10.3 GHC==8.0.1 GHC==8.0.2
-data-dir:       ""
 extra-source-files: ChangeLog
 
 source-repository head
@@ -45,23 +44,22 @@ library
     Build-Depends:   time < 1.5, old-locale >= 1.0 && <1.1
   else
     Build-Depends:   time >= 1.5
-  extensions:      CPP
   other-extensions: ExistentialQuantification
   ghc-options:      -Wall
   HS-Source-Dirs:    src
   exposed-modules:
-                   Control.Distributed.Process.Extras,
-                   Control.Distributed.Process.Extras.Call,
-                   Control.Distributed.Process.Extras.Monitoring,
-                   Control.Distributed.Process.Extras.SystemLog,
-                   Control.Distributed.Process.Extras.Time,
-                   Control.Distributed.Process.Extras.Timer,
-                   Control.Distributed.Process.Extras.UnsafePrimitives,
-                   Control.Concurrent.Utils,
-                   Control.Distributed.Process.Extras.Internal.Containers.MultiMap,
-                   Control.Distributed.Process.Extras.Internal.Primitives,
-                   Control.Distributed.Process.Extras.Internal.Types,
-                   Control.Distributed.Process.Extras.Internal.Queue.SeqQ,
+                   Control.Distributed.Process.Extras
+                   Control.Distributed.Process.Extras.Call
+                   Control.Distributed.Process.Extras.Monitoring
+                   Control.Distributed.Process.Extras.SystemLog
+                   Control.Distributed.Process.Extras.Time
+                   Control.Distributed.Process.Extras.Timer
+                   Control.Distributed.Process.Extras.UnsafePrimitives
+                   Control.Concurrent.Utils
+                   Control.Distributed.Process.Extras.Internal.Containers.MultiMap
+                   Control.Distributed.Process.Extras.Internal.Primitives
+                   Control.Distributed.Process.Extras.Internal.Types
+                   Control.Distributed.Process.Extras.Internal.Queue.SeqQ
                    Control.Distributed.Process.Extras.Internal.Queue.PriorityQ
                    Control.Distributed.Process.Extras.Internal.Unsafe
 
@@ -84,7 +82,6 @@ test-suite InternalQueueTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -rtsopts
-  extensions:      CPP
   main-is:         TestQueues.hs
   cpp-options:     -DTESTING
 
@@ -113,7 +110,6 @@ test-suite PrimitivesTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
-  extensions:      CPP
   main-is:         TestPrimitives.hs
 
 test-suite TimerTests
@@ -138,7 +134,6 @@ test-suite TimerTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -rtsopts
-  extensions:      CPP
   main-is:         TestTimer.hs
   cpp-options:     -DTESTING
 
@@ -175,5 +170,4 @@ test-suite LoggerTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-unused-do-bind
-  extensions:      CPP
   main-is:         TestLog.hs
diff --git a/packages/distributed-process-extras/src/Control/Distributed/Process/Extras/SystemLog.hs b/packages/distributed-process-extras/src/Control/Distributed/Process/Extras/SystemLog.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable   #-}
 {-# LANGUAGE DeriveGeneric        #-}
 {-# LANGUAGE ScopedTypeVariables  #-}

diff --git a/packages/distributed-process-extras/tests/TestLog.hs b/packages/distributed-process-extras/tests/TestLog.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 

diff --git a/packages/distributed-process-extras/tests/TestPrimitives.hs b/packages/distributed-process-extras/tests/TestPrimitives.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                       #-}
 {-# LANGUAGE DeriveDataTypeable        #-}
 {-# LANGUAGE TemplateHaskell           #-}
 

diff --git a/packages/distributed-process-extras/tests/TestTimer.hs b/packages/distributed-process-extras/tests/TestTimer.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
+{-# LANGUAGE CPP #-}
 module Main where
 
 #if ! MIN_VERSION_base(4,6,0)

diff --git a/packages/distributed-process-simplelocalnet/distributed-process-simplelocalnet.cabal b/packages/distributed-process-simplelocalnet/distributed-process-simplelocalnet.cabal
@@ -1,8 +1,8 @@
 Name:          distributed-process-simplelocalnet
 Version:       0.3.1
-Cabal-Version: >=1.10
+cabal-version: >=2.0
 Build-Type:    Simple
-License:       BSD3
+License:       BSD-3-Clause
 License-File:  LICENSE
 Copyright:     Well-Typed LLP
 Author:        Duncan Coutts, Nicolas Wu, Edsko de Vries

diff --git a/packages/distributed-process-supervisor/distributed-process-supervisor.cabal b/packages/distributed-process-supervisor/distributed-process-supervisor.cabal
@@ -1,8 +1,8 @@
+cabal-version:  3.0
 name:           distributed-process-supervisor
 version:        0.2.1
-cabal-version:  >=1.8
 build-type:     Simple
-license:        BSD3
+license:        BSD-3-Clause
 license-file:   LICENSE
 Copyright:      Tim Watson 2012 - 2013
 Author:         Tim Watson
@@ -21,7 +21,6 @@ description:    A part of the Cloud Haskell framework
                 For detailed information see "Control.Distributed.Process.Supervisor"
 category:       Control
 tested-with:    GHC == 8.2.2
-data-dir:       ""
 extra-source-files: ChangeLog
 
 source-repository head
@@ -48,7 +47,6 @@ library
                    time > 1.4 && < 1.15,
                    transformers,
                    exceptions >= 0.8.3 && < 0.11
-  extensions:      CPP
   hs-source-dirs:   src
   ghc-options:      -Wall
   exposed-modules:
@@ -93,7 +91,6 @@ test-suite SupervisorTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-name-shadowing -fno-warn-unused-do-bind -eventlog
-  extensions:      CPP
   main-is:         TestSupervisor.hs
   other-modules:   TestUtils
 
@@ -133,6 +130,5 @@ test-suite NonThreadedSupervisorTests
   hs-source-dirs:
                    tests
   ghc-options:     -Wall -rtsopts -fno-warn-unused-do-bind -fno-warn-name-shadowing
-  extensions:      CPP
   main-is:         TestSupervisor.hs
   other-modules:   TestUtils
diff --git a/packages/distributed-process-supervisor/src/Control/Distributed/Process/Supervisor.hs b/packages/distributed-process-supervisor/src/Control/Distributed/Process/Supervisor.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE BangPatterns              #-}
+{-# LANGUAGE CPP                       #-}
 {-# LANGUAGE DeriveDataTypeable        #-}
 {-# LANGUAGE DeriveGeneric             #-}
 {-# LANGUAGE ExistentialQuantification #-}

diff --git a/packages/distributed-process-supervisor/tests/TestSupervisor.hs b/packages/distributed-process-supervisor/tests/TestSupervisor.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                 #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TemplateHaskell     #-}
 {-# LANGUAGE RecordWildCards     #-}

diff --git a/packages/distributed-process-supervisor/tests/TestUtils.hs b/packages/distributed-process-supervisor/tests/TestUtils.hs
@@ -1,5 +1,6 @@
+{-# LANGUAGE CPP                       #-}
 {-# LANGUAGE DeriveDataTypeable        #-}
-{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE TupleSections             #-}
 {-# LANGUAGE TemplateHaskell           #-}
 {-# LANGUAGE DeriveGeneric             #-}
 

diff --git a/packages/distributed-process-systest/distributed-process-systest.cabal b/packages/distributed-process-systest/distributed-process-systest.cabal
@@ -1,16 +1,16 @@
+cabal-version: 3.0
 name:          distributed-process-systest
 version:       0.3.1
 synopsis:      Cloud Haskell Test Support
 description:   Testing Frameworks and Capabilities for programs built on Cloud Haskell
 homepage:      http://github.com/haskell-distributed/distributed-process-systest
-license:       BSD3
+license:       BSD-3-Clause
 license-file:  LICENSE
 Author:        Tim Watson
 Maintainer:    [email protected]
 copyright:     Tim Watson
 category:      Control, Cloud Haskell
 build-type:    Simple
-cabal-version: >=1.10
 
 source-repository head
   type:      git

diff --git a/packages/distributed-process-tests/distributed-process-tests.cabal b/packages/distributed-process-tests/distributed-process-tests.cabal
@@ -1,16 +1,16 @@
+cabal-version: 3.0
 name:          distributed-process-tests
 version:       0.4.12
 synopsis:      Tests and test support tools for distributed-process.
 homepage:      http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests
 description:   Tests and test suite for Cloud Haskell libraries.
-license:       BSD3
+license:       BSD-3-Clause
 license-file:  LICENSE
 Author:        Duncan Coutts, Nicolas Wu, Edsko de Vries
 Maintainer:    Tim Watson <[email protected]>
 copyright:     Well-Typed LLP
 category:      Control, Cloud Haskell
 build-type:    Simple
-cabal-version: >=1.10
 
 flag tcp
   Description: build and run TCP tests