remove vestigial unison-util package

2024-09-11 10:35:57 +03:00 · 2022-12-09 14:37:52 -05:00 · 2022-12-09 14:37:52 -05:00 · 7eee9e01bb
commit 7eee9e01bb
parent a59fdcf2c1
22 changed files with 3 additions and 124 deletions
--- a/codebase2/codebase-sqlite-hashing-v2/package.yaml
+++ b/codebase2/codebase-sqlite-hashing-v2/package.yaml
@ -18,7 +18,6 @@ dependencies:
  - unison-hashing-v2
  - unison-prelude
  - unison-sqlite
-  - unison-util
  - unison-util-base32hex
  - unison-util-term
  - vector
--- a/codebase2/codebase-sqlite-hashing-v2/unison-codebase-sqlite-hashing-v2.cabal
+++ b/codebase2/codebase-sqlite-hashing-v2/unison-codebase-sqlite-hashing-v2.cabal
@ -64,7 +64,6 @@ library
    , unison-hashing-v2
    , unison-prelude
    , unison-sqlite
-    , unison-util
    , unison-util-base32hex
    , unison-util-term
    , vector
--- a/codebase2/codebase-sqlite/package.yaml
+++ b/codebase2/codebase-sqlite/package.yaml
@ -31,7 +31,6 @@ dependencies:
  - unison-core
  - unison-prelude
  - unison-sqlite
-  - unison-util
  - unison-util-base32hex
  - unison-util-base32hex-orphans-sqlite
  - unison-util-cache
--- a/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
+++ b/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
@ -108,7 +108,6 @@ library
    , unison-core
    , unison-prelude
    , unison-sqlite
-    , unison-util
    , unison-util-base32hex
    , unison-util-base32hex-orphans-sqlite
    , unison-util-cache
--- a/codebase2/codebase/package.yaml
+++ b/codebase2/codebase/package.yaml
@ -32,7 +32,6 @@ dependencies:
  - mtl
  - text
  - unison-core
-  - unison-util
  - unison-util-base32hex
  - unison-prelude
  - time
--- a/codebase2/codebase/unison-codebase.cabal
+++ b/codebase2/codebase/unison-codebase.cabal
@ -58,6 +58,5 @@ library
    , time
    , unison-core
    , unison-prelude
-    , unison-util
    , unison-util-base32hex
  default-language: Haskell2010
--- a/codebase2/core/package.yaml
+++ b/codebase2/core/package.yaml
@ -11,7 +11,6 @@ dependencies:
  - base
  - containers
  - vector
-  - unison-util

 default-extensions:
  - ApplicativeDo
--- a/codebase2/core/unison-core.cabal
+++ b/codebase2/core/unison-core.cabal
@ -49,6 +49,5 @@ library
  build-depends:
      base
    , containers
-    , unison-util
    , vector
  default-language: Haskell2010
--- a/codebase2/util/package.yaml
+++ b/codebase2/util/package.yaml
@ -1,42 +0,0 @@
-name: unison-util
-github: unisonweb/unison
-
-library:
-  source-dirs: src
-  when:
-    - condition: false
-      other-modules: Paths_unison_util
-
-dependencies:
-  - base
-  - base32
-  - bytestring
-  - containers
-  - cryptonite
-  - extra
-  - lens
-  - memory
-  - safe
-  - text
-  - time
-  - unison-prelude
-  - unison-util-relation
-  - unliftio
-  - vector
-
-default-extensions:
-  - ApplicativeDo
-  - BlockArguments
-  - DeriveFunctor
-  - DerivingStrategies
-  - DoAndIfThenElse
-  - FlexibleContexts
-  - FlexibleInstances
-  - LambdaCase
-  - MultiParamTypeClasses
-  - NamedFieldPuns
-  - OverloadedStrings
-  - PatternSynonyms
-  - ScopedTypeVariables
-  - TupleSections
-  - TypeApplications
--- a/codebase2/util/unison-util.cabal
+++ b/codebase2/util/unison-util.cabal
@ -1,52 +0,0 @@
-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
-version:        0.0.0
-homepage:       https://github.com/unisonweb/unison#readme
-bug-reports:    https://github.com/unisonweb/unison/issues
-build-type:     Simple
-
-source-repository head
-  type: git
-  location: https://github.com/unisonweb/unison
-
-library
-  hs-source-dirs:
-      src
-  default-extensions:
-      ApplicativeDo
-      BlockArguments
-      DeriveFunctor
-      DerivingStrategies
-      DoAndIfThenElse
-      FlexibleContexts
-      FlexibleInstances
-      LambdaCase
-      MultiParamTypeClasses
-      NamedFieldPuns
-      OverloadedStrings
-      PatternSynonyms
-      ScopedTypeVariables
-      TupleSections
-      TypeApplications
-  build-depends:
-      base
-    , base32
-    , bytestring
-    , containers
-    , cryptonite
-    , extra
-    , lens
-    , memory
-    , safe
-    , text
-    , time
-    , unison-prelude
-    , unison-util-relation
-    , unliftio
-    , vector
-  default-language: Haskell2010
--- a/hie.yaml
+++ b/hie.yaml
@ -15,12 +15,6 @@ cradle:
    - path: "codebase2/core/./"
      component: "unison-core:lib"

-    - path: "codebase2/util/src"
-      component: "unison-util:lib"
-
-    - path: "codebase2/util/bench/Main.hs"
-      component: "unison-util:bench:bench"
-
    - path: "codebase2/util-serialization/./"
      component: "unison-util-serialization:lib"

@ -57,6 +51,9 @@ cradle:
    - path: "lib/unison-util-bytes/test"
      component: "unison-util-bytes:test:util-bytes-tests"

+    - path: "lib/unison-util-cache/src"
+      component: "unison-util-cache:lib"
+
    - path: "lib/unison-util-relation/src"
      component: "unison-util-relation:lib"

--- a/parser-typechecker/package.yaml
+++ b/parser-typechecker/package.yaml
@ -113,7 +113,6 @@ dependencies:
  - unison-pretty-printer
  - unison-sqlite
  - unison-syntax
-  - unison-util
  - unison-util-base32hex
  - unison-util-bytes
  - unison-util-cache
--- a/parser-typechecker/unison-parser-typechecker.cabal
+++ b/parser-typechecker/unison-parser-typechecker.cabal
@ -281,7 +281,6 @@ library
    , unison-pretty-printer
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-bytes
    , unison-util-cache
@ -470,7 +469,6 @@ test-suite parser-typechecker-tests
    , unison-pretty-printer
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-bytes
    , unison-util-cache
--- a/stack.yaml
+++ b/stack.yaml
@ -22,7 +22,6 @@ packages:
 - codebase2/codebase-sqlite-hashing-v2
 - codebase2/codebase-sync
 - codebase2/core
- codebase2/util
 - codebase2/util-serialization
 - codebase2/util-term
 - lib/unison-prelude
--- a/unison-cli/package.yaml
+++ b/unison-cli/package.yaml
@ -78,7 +78,6 @@ dependencies:
  - unison-share-api
  - unison-sqlite
  - unison-syntax
-  - unison-util
  - unison-util-base32hex
  - unison-util-relation
  - unliftio
--- a/unison-cli/unison-cli.cabal
+++ b/unison-cli/unison-cli.cabal
@ -191,7 +191,6 @@ library
    , unison-share-api
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
    , unliftio
@ -317,7 +316,6 @@ executable cli-integration-tests
    , unison-share-api
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
    , unliftio
@ -437,7 +435,6 @@ executable transcripts
    , unison-share-api
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
    , unliftio
@ -564,7 +561,6 @@ executable unison
    , unison-share-api
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
    , unliftio
@ -694,7 +690,6 @@ test-suite cli-tests
    , unison-share-api
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
    , unliftio
--- a/unison-core/package.yaml
+++ b/unison-core/package.yaml
@ -27,7 +27,6 @@ library:
    - transformers
    - unison-core
    - unison-prelude
-    - unison-util
    - unison-util-base32hex
    - unison-util-relation
    - vector
--- a/unison-core/unison-core1.cabal
+++ b/unison-core/unison-core1.cabal
@ -105,7 +105,6 @@ library
    , transformers
    , unison-core
    , unison-prelude
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
    , vector
--- a/unison-hashing-v2/package.yaml
+++ b/unison-hashing-v2/package.yaml
@ -15,7 +15,6 @@ dependencies:
  - text
  - unison-core1
  - unison-prelude
-  - unison-util
  - unison-util-base32hex
  - unison-util-relation

--- a/unison-hashing-v2/unison-hashing-v2.cabal
+++ b/unison-hashing-v2/unison-hashing-v2.cabal
@ -71,7 +71,6 @@ library
    , text
    , unison-core1
    , unison-prelude
-    , unison-util
    , unison-util-base32hex
    , unison-util-relation
  default-language: Haskell2010
--- a/unison-share-api/package.yaml
+++ b/unison-share-api/package.yaml
@ -46,7 +46,6 @@ dependencies:
  - unison-parser-typechecker
  - unison-prelude
  - unison-pretty-printer
-  - unison-util
  - unison-util-base32hex
  - unison-util-base32hex-orphans-aeson
  - unison-util-relation
--- a/unison-share-api/unison-share-api.cabal
+++ b/unison-share-api/unison-share-api.cabal
@ -107,7 +107,6 @@ library
    , unison-pretty-printer
    , unison-sqlite
    , unison-syntax
-    , unison-util
    , unison-util-base32hex
    , unison-util-base32hex-orphans-aeson
    , unison-util-relation