Fix up merge

unisonweb · Dec 3, 2024 · c32d0f4 · c32d0f4
1 parent fb12103
commit c32d0f4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1 deletion.
diff --git a/lib/unison-sqlite/package.yaml b/lib/unison-sqlite/package.yaml
@@ -9,6 +9,7 @@ library:
 
   dependencies:
     - base
+    - containers
     - direct-sqlite
     - megaparsec
     - pretty-simple

diff --git a/lib/unison-sqlite/unison-sqlite.cabal b/lib/unison-sqlite/unison-sqlite.cabal
@@ -64,6 +64,7 @@ library
   ghc-options: -Wall
   build-depends:
       base
+    , containers
     , direct-sqlite
     , megaparsec
     , pretty-simple

diff --git a/unison-cli/package.yaml b/unison-cli/package.yaml
@@ -67,6 +67,7 @@ library:
     - semialign
     - servant
     - servant-client
+    - servant-conduit
     - stm
     - temporary
     - text-ansi

diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs
@@ -2375,7 +2375,7 @@ prettyTransportError = \case
          in if Text.null body then Nothing else Just (P.newline <> "Response body: " <> P.text body),
         responseRequestId resp <&> \responseId -> P.newline <> "Request ID: " <> P.blue (P.text responseId)
       ]
-  StreamingError err ->
+  Share.StreamingError err ->
     P.lines
       [ ( "We encountered an error while streaming data from the code server: " <> P.text err),
         P.red (P.text err)

diff --git a/unison-cli/unison-cli.cabal b/unison-cli/unison-cli.cabal
@@ -242,6 +242,7 @@ library
     , semialign
     , servant
     , servant-client
+    , servant-conduit
     , stm
     , temporary
     , text

diff --git a/unison-share-api/package.yaml b/unison-share-api/package.yaml
@@ -66,6 +66,7 @@ dependencies:
   - unison-pretty-printer
   - unison-runtime
   - unison-util-relation
+  - unison-util-base32hex
   - unison-share-projects-api
   - unison-sqlite
   - unison-syntax

diff --git a/unison-share-api/unison-share-api.cabal b/unison-share-api/unison-share-api.cabal
@@ -132,6 +132,7 @@ library
     , unison-share-projects-api
     , unison-sqlite
     , unison-syntax
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , uri-encode
@@ -233,6 +234,7 @@ test-suite unison-share-api-tests
     , unison-share-projects-api
     , unison-sqlite
     , unison-syntax
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , uri-encode