merge unison-cli:lib and unison-cli:lib:unison-cli-lib because stack can't really handle internal libraries

hie.yaml

@@ -99,11 +99,8 @@ cradle:
     - path: "parser-typechecker/tests"
       component: "unison-parser-typechecker:test:parser-typechecker-tests"
 
-    - path: "unison-cli/unison"
-      component: "unison-cli:lib"
-
     - path: "unison-cli/src"
-      component: "unison-cli:lib:unison-cli-lib"
+      component: "unison-cli:lib"
 
     - path: "unison-cli/transcripts/Transcripts.hs"
       component: "unison-cli:exe:transcripts"

unison-cli/package.yaml

@@ -103,27 +103,19 @@ dependencies:
   - witch
   - witherable
 
-internal-libraries:
-  unison-cli-lib:
-    source-dirs: src
-    when:
-      - condition: "!os(windows)"
-        dependencies: unix
-      - condition: false
-        other-modules: Paths_unison_cli
-
 library:
-  source-dirs: unison
+  source-dirs: src
   when:
     - condition: false
       other-modules: Paths_unison_cli
+    - condition: "!os(windows)"
+      dependencies: unix
   dependencies:
     - code-page
     - optparse-applicative >= 0.16.1.0
     - shellmet
     - template-haskell
     - temporary
-    - unison-cli-lib
 
 tests:
   cli-tests:
@@ -136,7 +128,7 @@ tests:
       - here
       - shellmet
       - temporary
-      - unison-cli-lib
+      - unison-cli
     main: Main.hs
     source-dirs: tests
 
@@ -153,7 +145,7 @@ executables:
       - easytest
       - process
       - shellmet
-      - unison-cli-lib
+      - unison-cli
       - silently
 
 when:

unison-cli/unison-cli.cabal

@@ -1,4 +1,4 @@
-cabal-version: 2.0
+cabal-version: 1.12
 
 -- This file has been generated from package.yaml by hpack version 0.36.0.
 --
@@ -24,146 +24,9 @@ flag optimized
 library
   exposed-modules:
       ArgParse
+      Compat
       Stats
       System.Path
-      Unison.Main
-      Unison.Version
-  hs-source-dirs:
-      unison
-  default-extensions:
-      ApplicativeDo
-      BangPatterns
-      BlockArguments
-      DeriveAnyClass
-      DeriveFunctor
-      DeriveFoldable
-      DeriveTraversable
-      DeriveGeneric
-      DerivingStrategies
-      DerivingVia
-      DoAndIfThenElse
-      DuplicateRecordFields
-      FlexibleContexts
-      FlexibleInstances
-      GADTs
-      GeneralizedNewtypeDeriving
-      ImportQualifiedPost
-      InstanceSigs
-      KindSignatures
-      LambdaCase
-      MultiParamTypeClasses
-      MultiWayIf
-      NamedFieldPuns
-      NumericUnderscores
-      OverloadedLabels
-      OverloadedStrings
-      PatternSynonyms
-      RankNTypes
-      ScopedTypeVariables
-      TupleSections
-      TypeApplications
-      ViewPatterns
-  ghc-options: -Wall
-  build-depends:
-      IntervalMap
-    , ListLike
-    , aeson >=2.0.0.0
-    , aeson-pretty
-    , ansi-terminal
-    , async
-    , base
-    , bytes
-    , bytestring
-    , co-log-core
-    , code-page
-    , concurrent-output
-    , configurator
-    , containers >=0.6.3
-    , cryptonite
-    , directory
-    , either
-    , errors
-    , exceptions
-    , extra
-    , filepath
-    , free
-    , friendly-time
-    , fsnotify
-    , fuzzyfind
-    , generic-lens
-    , haskeline
-    , http-client >=0.7.6
-    , http-client-tls
-    , http-types
-    , jwt
-    , ki
-    , lens
-    , lock-file
-    , lsp >=2.2.0.0
-    , lsp-types >=2.0.2.0
-    , megaparsec
-    , memory
-    , mtl
-    , network
-    , network-simple
-    , network-uri
-    , nonempty-containers
-    , open-browser
-    , optparse-applicative >=0.16.1.0
-    , pretty-simple
-    , process
-    , random >=1.2.0
-    , random-shuffle
-    , recover-rtti
-    , regex-tdfa
-    , semialign
-    , semigroups
-    , servant
-    , servant-client
-    , shellmet
-    , stm
-    , template-haskell
-    , temporary
-    , text
-    , text-builder
-    , text-rope
-    , these
-    , these-lens
-    , time
-    , transformers
-    , unison-cli-lib
-    , unison-codebase
-    , unison-codebase-sqlite
-    , unison-codebase-sqlite-hashing-v2
-    , unison-core
-    , unison-core1
-    , unison-hash
-    , unison-parser-typechecker
-    , unison-prelude
-    , unison-pretty-printer
-    , unison-share-api
-    , unison-share-projects-api
-    , unison-sqlite
-    , unison-syntax
-    , unison-util-base32hex
-    , unison-util-nametree
-    , unison-util-relation
-    , unliftio
-    , unordered-containers
-    , uri-encode
-    , uuid
-    , vector
-    , wai
-    , warp
-    , witch
-    , witherable
-  default-language: Haskell2010
-  if flag(optimized)
-    ghc-options: -O2 -funbox-strict-fields
-
-library unison-cli-lib
-  exposed-modules:
-      Compat
       Unison.Auth.CredentialFile
       Unison.Auth.CredentialManager
       Unison.Auth.Discovery
@@ -267,11 +130,13 @@ library unison-cli-lib
       Unison.LSP.Types
       Unison.LSP.UCMWorker
       Unison.LSP.VFS
+      Unison.Main
       Unison.Share.Codeserver
       Unison.Share.ExpectedHashMismatches
       Unison.Share.Sync
       Unison.Share.Sync.Types
       Unison.Util.HTTP
+      Unison.Version
   hs-source-dirs:
       src
   default-extensions:
@@ -514,7 +379,7 @@ executable transcripts
     , these-lens
     , time
     , transformers
-    , unison-cli-lib
+    , unison-cli
     , unison-codebase
     , unison-codebase-sqlite
     , unison-codebase-sqlite-hashing-v2
@@ -659,7 +524,7 @@ test-suite cli-tests
     , these-lens
     , time
     , transformers
-    , unison-cli-lib
+    , unison-cli
     , unison-codebase
     , unison-codebase-sqlite
     , unison-codebase-sqlite-hashing-v2