extract unison-util-base32hex package

codebase2/codebase-sqlite/package.yaml

@@ -56,5 +56,6 @@ dependencies:
   - unison-core
   - unison-prelude
   - unison-util
+  - unison-util-base32hex
   - unison-util-serialization
   - unison-util-term

codebase2/codebase-sqlite/unison-codebase-sqlite.cabal

@@ -95,6 +95,7 @@ library
     , unison-core
     , unison-prelude
     , unison-util
+    , unison-util-base32hex
     , unison-util-serialization
     , unison-util-term
     , unliftio

codebase2/codebase/package.yaml

@@ -30,4 +30,5 @@ dependencies:
   - text
   - unison-core
   - unison-util
+  - unison-util-base32hex
   - unison-prelude

codebase2/codebase/unison-codebase.cabal

@@ -3,8 +3,6 @@ cabal-version: 1.12
 -- This file has been generated from package.yaml by hpack version 0.34.4.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: b4d3c77715f39c915cacffccf179f1ed62bce29ba013cecc3a25c847f5851233
 
 name:           unison-codebase
 version:        0.0.0
@@ -62,4 +60,5 @@ library
     , unison-core
     , unison-prelude
     , unison-util
+    , unison-util-base32hex
   default-language: Haskell2010

codebase2/util/unison-util.cabal

@@ -17,10 +17,8 @@ source-repository head
 library
   exposed-modules:
       U.Util.Alternative
-      U.Util.Base32Hex
       U.Util.Cache
       U.Util.Components
-      U.Util.Hash
       U.Util.Lens
       U.Util.Monoid
       U.Util.String

hie.yaml

@@ -33,6 +33,9 @@ cradle:
     - path: "unison-share-api/src"
       component: "unison-share-api:lib"
 
+    - path: "lib/unison-util-base32hex/src"
+      component: "unison-util-base32hex:lib"
+
     - path: "lib/unison-util-relation/src"
       component: "unison-util-relation:lib"
 

lib/unison-util-base32hex/package.yaml

@@ -0,0 +1,41 @@
+name: unison-util-base32hex
+github: unisonweb/unison
+copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors
+
+library:
+  source-dirs: src
+
+dependencies:
+  - base
+  - base32
+  - bytestring
+  - containers
+  - unison-prelude
+  - text
+
+ghc-options:
+  -Wall
+
+default-extensions:
+  - ApplicativeDo
+  - BangPatterns
+  - BlockArguments
+  - DeriveFunctor
+  - DeriveGeneric
+  - DeriveTraversable
+  - DerivingStrategies
+  - DerivingVia
+  - DoAndIfThenElse
+  - FlexibleContexts
+  - FlexibleInstances
+  - GeneralizedNewtypeDeriving
+  - LambdaCase
+  - MultiParamTypeClasses
+  - NamedFieldPuns
+  - OverloadedStrings
+  - PatternSynonyms
+  - RankNTypes
+  - ScopedTypeVariables
+  - TupleSections
+  - TypeApplications
+  - ViewPatterns

lib/unison-util-base32hex/src/U/Util/Base32Hex.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE ViewPatterns #-}
-
 module U.Util.Base32Hex
   ( Base32Hex (UnsafeFromText),
     fromByteString,
@@ -10,13 +8,11 @@ module U.Util.Base32Hex
   )
 where
 
-import Data.ByteString (ByteString)
 import qualified Data.ByteString.Base32.Hex as Base32.Hex
-import Data.Set (Set)
 import qualified Data.Set as Set
-import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text
+import Unison.Prelude
 
 newtype Base32Hex = UnsafeFromText Text
   deriving (Eq, Ord, Show)

lib/unison-util-base32hex/unison-util-base32hex.cabal

@@ -0,0 +1,57 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.34.4.
+--
+-- see: https://github.com/sol/hpack
+
+name:           unison-util-base32hex
+version:        0.0.0
+homepage:       https://github.com/unisonweb/unison#readme
+bug-reports:    https://github.com/unisonweb/unison/issues
+copyright:      Copyright (C) 2013-2021 Unison Computing, PBC and contributors
+build-type:     Simple
+
+source-repository head
+  type: git
+  location: https://github.com/unisonweb/unison
+
+library
+  exposed-modules:
+      U.Util.Base32Hex
+      U.Util.Hash
+  other-modules:
+      Paths_unison_util_base32hex
+  hs-source-dirs:
+      src
+  default-extensions:
+      ApplicativeDo
+      BangPatterns
+      BlockArguments
+      DeriveFunctor
+      DeriveGeneric
+      DeriveTraversable
+      DerivingStrategies
+      DerivingVia
+      DoAndIfThenElse
+      FlexibleContexts
+      FlexibleInstances
+      GeneralizedNewtypeDeriving
+      LambdaCase
+      MultiParamTypeClasses
+      NamedFieldPuns
+      OverloadedStrings
+      PatternSynonyms
+      RankNTypes
+      ScopedTypeVariables
+      TupleSections
+      TypeApplications
+      ViewPatterns
+  ghc-options: -Wall
+  build-depends:
+      base
+    , base32
+    , bytestring
+    , containers
+    , text
+    , unison-prelude
+  default-language: Haskell2010

parser-typechecker/package.yaml

@@ -117,6 +117,7 @@ library:
     - unison-prelude
     - unison-pretty-printer
     - unison-util
+    - unison-util-base32hex
     - unison-util-relation
     - open-browser
     - uri-encode

parser-typechecker/unison-parser-typechecker.cabal

@@ -297,6 +297,7 @@ library
     , unison-prelude
     , unison-pretty-printer
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , uri-encode

stack.yaml

@@ -24,6 +24,7 @@ packages:
 - codebase2/util-term
 - lib/unison-prelude
 - lib/unison-sqlite
+- lib/unison-util-base32hex
 - lib/unison-util-relation
 - lib/unison-pretty-printer
 

unison-cli/package.yaml

@@ -42,6 +42,7 @@ dependencies:
   - unison-parser-typechecker
   - unison-prelude
   - unison-util
+  - unison-util-base32hex
   - unison-util-relation
   - unison-pretty-printer
   - unison-share-api

unison-cli/unison-cli.cabal

@@ -139,6 +139,7 @@ library
     , unison-pretty-printer
     , unison-share-api
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , wai
@@ -236,6 +237,7 @@ executable cli-integration-tests
     , unison-pretty-printer
     , unison-share-api
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , wai
@@ -328,6 +330,7 @@ executable transcripts
     , unison-pretty-printer
     , unison-share-api
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , wai
@@ -424,6 +427,7 @@ executable unison
     , unison-pretty-printer
     , unison-share-api
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , wai
@@ -524,6 +528,7 @@ test-suite cli-tests
     , unison-pretty-printer
     , unison-share-api
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , unliftio
     , wai

unison-core/package.yaml

@@ -25,6 +25,7 @@ library:
     - transformers
     - unison-prelude
     - unison-util
+    - unison-util-base32hex
     - unison-util-relation
     - util
     - vector

unison-core/unison-core1.cabal

@@ -103,6 +103,7 @@ library
     , transformers
     , unison-prelude
     , unison-util
+    , unison-util-base32hex
     , unison-util-relation
     , util
     , vector