Fix cabal file.

Author: m-renaud

cabal-install/cabal-install.cabal

@@ -1,4 +1,4 @@
-Cabal-Version:      2.0
+Cabal-Version:      >= 1.10
 -- NOTE: This file is autogenerated from 'cabal-install.cabal.pp'.
 -- DO NOT EDIT MANUALLY.
 -- To update this file, edit 'cabal-install.cabal.pp' and run
@@ -126,7 +126,9 @@ Flag lukko
   default:      True
   manual:       True
 
-library cabal-lib-client
+executable cabal
+    main-is:        Main.hs
+    hs-source-dirs: main
     default-language: Haskell2010
     ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
     if impl(ghc >= 8.0)
@@ -135,8 +137,14 @@ library cabal-lib-client
       if impl(ghc < 8.8)
         ghc-options: -Wnoncanonical-monadfail-instances
 
+
+    ghc-options: -rtsopts -threaded
+
+    -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
+    if os(aix)
+        extra-libraries: bsd
     hs-source-dirs: .
-    exposed-modules:
+    other-modules:
         -- this modules are moved from Cabal
         -- they are needed for as long until cabal-install moves to parsec parser
         Distribution.Deprecated.ParseUtils
@@ -319,8 +327,6 @@ library cabal-lib-client
         Distribution.Solver.Types.Variable
         Paths_cabal_install
 
-    autogen-modules:
-        Paths_cabal_install
     build-depends:
         async      >= 2.0      && < 2.3,
         array      >= 0.4      && < 0.6,
@@ -386,187 +392,3 @@ library cabal-lib-client
     if flag(debug-tracetree)
       cpp-options: -DDEBUG_TRACETREE
       build-depends: tracetree >= 0.1 && < 0.2
-
-library cabal-install-solver-dsl
-    default-language: Haskell2010
-    ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-    if impl(ghc >= 8.0)
-        ghc-options: -Wcompat
-                     -Wnoncanonical-monad-instances
-      if impl(ghc < 8.8)
-        ghc-options: -Wnoncanonical-monadfail-instances
-
-    hs-source-dirs: solver-dsl
-    exposed-modules:
-        UnitTests.Distribution.Solver.Modular.DSL
-    build-depends:
-        base,
-        Cabal,
-        containers,
-        -- TODO: depend on cabal-install-solver only
-        cabal-lib-client
-executable cabal
-    main-is:        Main.hs
-    hs-source-dirs: main
-    default-language: Haskell2010
-    ghc-options:    -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns
-    if impl(ghc >= 8.0)
-        ghc-options: -Wcompat
-                     -Wnoncanonical-monad-instances
-      if impl(ghc < 8.8)
-        ghc-options: -Wnoncanonical-monadfail-instances
-
-
-    ghc-options: -rtsopts -threaded
-
-    -- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
-    if os(aix)
-        extra-libraries: bsd
-    build-depends:
-        cabal-lib-client,
-        Cabal,
-        base,
-        directory,
-        filepath
-
-    other-modules: Paths_cabal_install
-Test-Suite unit-tests
-  type: exitcode-stdio-1.0
-  main-is: UnitTests.hs
-  hs-source-dirs: tests
-  ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -main-is UnitTests
-  other-modules:
-    UnitTests.Distribution.Client.ArbitraryInstances
-    UnitTests.Distribution.Client.Described
-    UnitTests.Distribution.Client.Targets
-    UnitTests.Distribution.Client.FileMonitor
-    UnitTests.Distribution.Client.Get
-    UnitTests.Distribution.Client.GenericInstances
-    UnitTests.Distribution.Client.Glob
-    UnitTests.Distribution.Client.GZipUtils
-    UnitTests.Distribution.Client.Init.FileCreators
-    UnitTests.Distribution.Client.Store
-    UnitTests.Distribution.Client.Tar
-    UnitTests.Distribution.Client.TreeDiffInstances
-    UnitTests.Distribution.Client.UserConfig
-    UnitTests.Distribution.Client.ProjectConfig
-    UnitTests.Distribution.Client.JobControl
-    UnitTests.Distribution.Client.IndexUtils.Timestamp
-    UnitTests.Distribution.Client.InstallPlan
-    UnitTests.Distribution.Client.VCS
-    UnitTests.Distribution.Solver.Modular.Builder
-    UnitTests.Distribution.Solver.Modular.RetryLog
-    UnitTests.Distribution.Solver.Modular.Solver
-    UnitTests.Distribution.Solver.Modular.DSL.TestCaseUtils
-    UnitTests.Distribution.Solver.Modular.WeightedPSQ
-    UnitTests.Options
-    UnitTests.TempTestDir
-  build-depends:
-        array,
-        base,
-        async,
-        bytestring,
-        cabal-lib-client,
-        cabal-install-solver-dsl,
-        Cabal,
-        Cabal-quickcheck,
-        containers,
-        deepseq,
-        mtl,
-        random,
-        directory,
-        filepath,
-        tar,
-        time,
-        zlib,
-        rere >=0.1 && <0.2,
-        network-uri < 2.6.2.0,
-        network,
-        tasty >= 1.2.3 && <1.3,
-        tasty-golden >=2.3.1.1 && <2.4,
-        tasty-hunit >= 0.10,
-        tasty-quickcheck,
-        tagged,
-        tree-diff,
-        QuickCheck >= 2.8.2
-
-  ghc-options: -threaded
-
-  default-language: Haskell2010
-
-Test-Suite memory-usage-tests
-  type: exitcode-stdio-1.0
-  main-is: MemoryUsageTests.hs
-  hs-source-dirs: tests
-  ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns "-with-rtsopts=-M4M -K1K" -main-is MemoryUsageTests
-  other-modules:
-    UnitTests.Distribution.Solver.Modular.DSL.TestCaseUtils
-    UnitTests.Distribution.Solver.Modular.MemoryUsage
-    UnitTests.Options
-  build-depends:
-        base,
-        async,
-        Cabal,
-        cabal-lib-client,
-        cabal-install-solver-dsl,
-        containers,
-        deepseq,
-        tagged,
-        tasty >= 1.2.3 && <1.3,
-        tasty-hunit >= 0.10
-
-  ghc-options: -threaded
-
-  default-language: Haskell2010
-
-Test-Suite solver-quickcheck
-  type: exitcode-stdio-1.0
-  main-is: SolverQuickCheck.hs
-  hs-source-dirs: tests
-  ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -main-is SolverQuickCheck
-  other-modules:
-    UnitTests.Distribution.Solver.Modular.QuickCheck
-    UnitTests.Distribution.Solver.Modular.QuickCheck.Utils
-  build-depends:
-        base,
-        async,
-        Cabal,
-        cabal-lib-client,
-        cabal-install-solver-dsl,
-        containers,
-        deepseq >= 1.2,
-        hashable,
-        random,
-        tagged,
-        tasty >= 1.2.3 && <1.3,
-        tasty-quickcheck,
-        QuickCheck >= 2.8.2,
-        pretty-show >= 1.6.15
-
-  ghc-options: -threaded
-
-  default-language: Haskell2010
-
-test-suite integration-tests2
-  type: exitcode-stdio-1.0
-  main-is: IntegrationTests2.hs
-  hs-source-dirs: tests
-  ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -main-is IntegrationTests2
-  other-modules:
-  build-depends:
-        base,
-        bytestring,
-        Cabal,
-        cabal-lib-client,
-        containers,
-        deepseq,
-        directory,
-        edit-distance,
-        filepath,
-        tasty >= 1.2.3 && <1.3,
-        tasty-hunit >= 0.10,
-        tagged
-
-  ghc-options: -threaded
-  default-language: Haskell2010
-