move Unison.Hash and friends to new unison-hash package

2024-09-11 10:35:57 +03:00 · 2022-12-14 18:50:23 -05:00 · 2022-12-14 18:50:23 -05:00 · bbc17e01a6
commit bbc17e01a6
parent 3e48cabaad
34 changed files with 156 additions and 23 deletions
--- a/codebase2/codebase-sqlite-hashing-v2/package.yaml
+++ b/codebase2/codebase-sqlite-hashing-v2/package.yaml
@ -15,6 +15,7 @@ dependencies:
  - unison-codebase-sqlite
  - unison-core
  - unison-core1
+  - unison-hash
  - unison-hashing-v2
  - unison-prelude
  - unison-sqlite
--- a/codebase2/codebase-sqlite-hashing-v2/unison-codebase-sqlite-hashing-v2.cabal
+++ b/codebase2/codebase-sqlite-hashing-v2/unison-codebase-sqlite-hashing-v2.cabal
@ -61,6 +61,7 @@ library
    , unison-codebase-sqlite
    , unison-core
    , unison-core1
+    , unison-hash
    , unison-hashing-v2
    , unison-prelude
    , unison-sqlite
--- a/codebase2/codebase-sqlite/package.yaml
+++ b/codebase2/codebase-sqlite/package.yaml
@ -29,11 +29,12 @@ dependencies:
  - unison-codebase
  - unison-codebase-sync
  - unison-core
+  - unison-hash
+  - unison-hash-orphans-sqlite
  - unison-prelude
  - unison-sqlite
  - unison-util
  - unison-util-base32hex
-  - unison-util-base32hex-orphans-sqlite
  - unison-util-serialization
  - unison-util-term
  - unliftio
--- a/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
+++ b/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
@ -106,11 +106,12 @@ library
    , unison-codebase
    , unison-codebase-sync
    , unison-core
+    , unison-hash
+    , unison-hash-orphans-sqlite
    , unison-prelude
    , unison-sqlite
    , unison-util
    , unison-util-base32hex
-    , unison-util-base32hex-orphans-sqlite
    , unison-util-serialization
    , unison-util-term
    , unliftio
--- a/codebase2/codebase/package.yaml
+++ b/codebase2/codebase/package.yaml
@ -32,6 +32,7 @@ dependencies:
  - mtl
  - text
  - unison-core
+  - unison-hash
  - unison-util
  - unison-util-base32hex
  - unison-prelude
--- a/codebase2/codebase/unison-codebase.cabal
+++ b/codebase2/codebase/unison-codebase.cabal
@ -57,6 +57,7 @@ library
    , text
    , time
    , unison-core
+    , unison-hash
    , unison-prelude
    , unison-util
    , unison-util-base32hex
--- a/codebase2/core/unison-core.cabal
+++ b/codebase2/core/unison-core.cabal
@ -18,7 +18,6 @@ library
  exposed-modules:
      U.Core.ABT
      U.Core.ABT.Var
-      Unison.ContentAddressable
  hs-source-dirs:
      ./
  default-extensions:
--- a/hie.yaml
+++ b/hie.yaml
@ -27,6 +27,15 @@ cradle:
    - path: "codebase2/util-term/./"
      component: "unison-util-term:lib"

+    - path: "lib/unison-hash/src"
+      component: "unison-hash:lib"
+
+    - path: "lib/unison-hash-orphans-aeson/src"
+      component: "unison-hash-orphans-aeson:lib"
+
+    - path: "lib/unison-hash-orphans-sqlite/src"
+      component: "unison-hash-orphans-sqlite:lib"
+
    - path: "lib/unison-prelude/src"
      component: "unison-prelude:lib"

@ -45,12 +54,6 @@ cradle:
    - path: "lib/unison-util-base32hex/src"
      component: "unison-util-base32hex:lib"

-    - path: "lib/unison-util-base32hex-orphans-aeson/src"
-      component: "unison-util-base32hex-orphans-aeson:lib"
-
-    - path: "lib/unison-util-base32hex-orphans-sqlite/src"
-      component: "unison-util-base32hex-orphans-sqlite:lib"
-
    - path: "lib/unison-util-bytes/src"
      component: "unison-util-bytes:lib"

--- a/lib/unison-util-base32hex-orphans-aeson/package.yaml
+++ b/lib/unison-util-base32hex-orphans-aeson/package.yaml
@ -1,17 +1,18 @@
-name: unison-util-base32hex-orphans-aeson
+name: unison-hash-orphans-aeson
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors

 library:
  when:
    - condition: false
-      other-modules: Paths_unison_util_base32hex_orphans_aeson
+      other-modules: Paths_unison_hash_orphans_aeson
  source-dirs: src

 dependencies:
  - aeson
  - base
  - text
+  - unison-hash
  - unison-util-base32hex

 ghc-options:
--- a/lib/unison-util-base32hex-orphans-aeson/src/U/Util/Hash32/Orphans/Aeson.hs
+++ b/lib/unison-util-base32hex-orphans-aeson/src/U/Util/Hash32/Orphans/Aeson.hs
--- a/lib/unison-util-base32hex-orphans-aeson/unison-util-base32hex-orphans-aeson.cabal
+++ b/lib/unison-util-base32hex-orphans-aeson/unison-util-base32hex-orphans-aeson.cabal
@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack

-name:           unison-util-base32hex-orphans-aeson
+name:           unison-hash-orphans-aeson
 version:        0.0.0
 homepage:       https://github.com/unisonweb/unison#readme
 bug-reports:    https://github.com/unisonweb/unison/issues
@ -49,5 +49,6 @@ library
      aeson
    , base
    , text
+    , unison-hash
    , unison-util-base32hex
  default-language: Haskell2010
--- a/lib/unison-util-base32hex-orphans-sqlite/package.yaml
+++ b/lib/unison-util-base32hex-orphans-sqlite/package.yaml
@ -1,17 +1,18 @@
-name: unison-util-base32hex-orphans-sqlite
+name: unison-hash-orphans-sqlite
 github: unisonweb/unison
 copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors

 library:
  when:
    - condition: false
-      other-modules: Paths_unison_util_base32hex_orphans_sqlite
+      other-modules: Paths_unison_hash_orphans_sqlite
  source-dirs: src

 dependencies:
  - base
  - sqlite-simple
  - text
+  - unison-hash
  - unison-util-base32hex

 ghc-options:
--- a/lib/unison-util-base32hex-orphans-sqlite/src/U/Util/Hash32/Orphans/Sqlite.hs
+++ b/lib/unison-util-base32hex-orphans-sqlite/src/U/Util/Hash32/Orphans/Sqlite.hs
--- a/lib/unison-util-base32hex-orphans-sqlite/unison-util-base32hex-orphans-sqlite.cabal
+++ b/lib/unison-util-base32hex-orphans-sqlite/unison-util-base32hex-orphans-sqlite.cabal
@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack

-name:           unison-util-base32hex-orphans-sqlite
+name:           unison-hash-orphans-sqlite
 version:        0.0.0
 homepage:       https://github.com/unisonweb/unison#readme
 bug-reports:    https://github.com/unisonweb/unison/issues
@ -49,5 +49,6 @@ library
      base
    , sqlite-simple
    , text
+    , unison-hash
    , unison-util-base32hex
  default-language: Haskell2010
--- a/lib/unison-hash/package.yaml
+++ b/lib/unison-hash/package.yaml
@ -0,0 +1,46 @@
+name: unison-hash
+github: unisonweb/unison
+copyright: Copyright (C) 2013-2021 Unison Computing, PBC and contributors
+
+ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+
+dependencies:
+  - base
+  - bytestring
+  - text
+  - unison-prelude
+  - unison-util-base32hex
+
+library:
+  source-dirs: src
+  when:
+    - condition: false
+      other-modules: Paths_unison_hash
+
+default-extensions:
+  - ApplicativeDo
+  - BangPatterns
+  - BlockArguments
+  - DeriveAnyClass
+  - DeriveFunctor
+  - DeriveGeneric
+  - DeriveTraversable
+  - DerivingStrategies
+  - DerivingVia
+  - DoAndIfThenElse
+  - DuplicateRecordFields
+  - FlexibleContexts
+  - FlexibleInstances
+  - GeneralizedNewtypeDeriving
+  - LambdaCase
+  - MultiParamTypeClasses
+  - NamedFieldPuns
+  - OverloadedStrings
+  - PatternSynonyms
+  - RankNTypes
+  - ScopedTypeVariables
+  - StandaloneDeriving
+  - TupleSections
+  - TypeApplications
+  - TypeFamilies
+  - ViewPatterns
--- a/lib/unison-util-base32hex/src/U/Util/Hash.hs
+++ b/lib/unison-util-base32hex/src/U/Util/Hash.hs
--- a/lib/unison-util-base32hex/src/U/Util/Hash32.hs
+++ b/lib/unison-util-base32hex/src/U/Util/Hash32.hs
--- a/lib/unison-hash/src/Unison/ContentAddressable.hs
+++ b/lib/unison-hash/src/Unison/ContentAddressable.hs
--- a/lib/unison-hash/src/Unison/Hash.hs
+++ b/lib/unison-hash/src/Unison/Hash.hs
--- a/lib/unison-hash/unison-hash.cabal
+++ b/lib/unison-hash/unison-hash.cabal
@ -0,0 +1,60 @@
+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-hash
+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.Hash
+      U.Util.Hash32
+      Unison.ContentAddressable
+      Unison.Hash
+  hs-source-dirs:
+      src
+  default-extensions:
+      ApplicativeDo
+      BangPatterns
+      BlockArguments
+      DeriveAnyClass
+      DeriveFunctor
+      DeriveGeneric
+      DeriveTraversable
+      DerivingStrategies
+      DerivingVia
+      DoAndIfThenElse
+      DuplicateRecordFields
+      FlexibleContexts
+      FlexibleInstances
+      GeneralizedNewtypeDeriving
+      LambdaCase
+      MultiParamTypeClasses
+      NamedFieldPuns
+      OverloadedStrings
+      PatternSynonyms
+      RankNTypes
+      ScopedTypeVariables
+      StandaloneDeriving
+      TupleSections
+      TypeApplications
+      TypeFamilies
+      ViewPatterns
+  ghc-options: -Wall -O0 -fno-warn-name-shadowing -fno-warn-missing-pattern-synonym-signatures
+  build-depends:
+      base
+    , bytestring
+    , text
+    , unison-prelude
+    , unison-util-base32hex
+  default-language: Haskell2010
--- a/lib/unison-util-base32hex/unison-util-base32hex.cabal
+++ b/lib/unison-util-base32hex/unison-util-base32hex.cabal
@ -18,8 +18,6 @@ source-repository head
 library
  exposed-modules:
      U.Util.Base32Hex
-      U.Util.Hash
-      U.Util.Hash32
  hs-source-dirs:
      src
  default-extensions:
--- a/parser-typechecker/package.yaml
+++ b/parser-typechecker/package.yaml
@ -108,6 +108,7 @@ dependencies:
  - unison-codebase-sync
  - unison-core
  - unison-core1
+  - unison-hash
  - unison-hashing-v2
  - unison-prelude
  - unison-pretty-printer
--- a/parser-typechecker/unison-parser-typechecker.cabal
+++ b/parser-typechecker/unison-parser-typechecker.cabal
@ -276,6 +276,7 @@ library
    , unison-codebase-sync
    , unison-core
    , unison-core1
+    , unison-hash
    , unison-hashing-v2
    , unison-prelude
    , unison-pretty-printer
@ -463,6 +464,7 @@ test-suite parser-typechecker-tests
    , unison-codebase-sync
    , unison-core
    , unison-core1
+    , unison-hash
    , unison-hashing-v2
    , unison-parser-typechecker
    , unison-prelude
--- a/stack.yaml
+++ b/stack.yaml
@ -25,11 +25,12 @@ packages:
 - codebase2/util
 - codebase2/util-serialization
 - codebase2/util-term
+- lib/unison-hash
+- lib/unison-hash-orphans-aeson
+- lib/unison-hash-orphans-sqlite
 - lib/unison-prelude
 - lib/unison-sqlite
 - lib/unison-util-base32hex
- lib/unison-util-base32hex-orphans-aeson
- lib/unison-util-base32hex-orphans-sqlite
 - lib/unison-util-bytes
 - lib/unison-util-relation
 - lib/unison-util-rope
--- a/unison-cli/package.yaml
+++ b/unison-cli/package.yaml
@ -70,8 +70,8 @@ dependencies:
  - unison-codebase
  - unison-codebase-sqlite
  - unison-codebase-sqlite-hashing-v2
-  - unison-sqlite
  - unison-core1
+  - unison-hash
  - unison-parser-typechecker
  - unison-prelude
  - unison-pretty-printer
--- a/unison-cli/unison-cli.cabal
+++ b/unison-cli/unison-cli.cabal
@ -185,6 +185,7 @@ library
    , unison-codebase-sqlite
    , unison-codebase-sqlite-hashing-v2
    , unison-core1
+    , unison-hash
    , unison-parser-typechecker
    , unison-prelude
    , unison-pretty-printer
@ -311,6 +312,7 @@ executable cli-integration-tests
    , unison-codebase-sqlite
    , unison-codebase-sqlite-hashing-v2
    , unison-core1
+    , unison-hash
    , unison-parser-typechecker
    , unison-prelude
    , unison-pretty-printer
@ -431,6 +433,7 @@ executable transcripts
    , unison-codebase-sqlite
    , unison-codebase-sqlite-hashing-v2
    , unison-core1
+    , unison-hash
    , unison-parser-typechecker
    , unison-prelude
    , unison-pretty-printer
@ -558,6 +561,7 @@ executable unison
    , unison-codebase-sqlite
    , unison-codebase-sqlite-hashing-v2
    , unison-core1
+    , unison-hash
    , unison-parser-typechecker
    , unison-prelude
    , unison-pretty-printer
@ -688,6 +692,7 @@ test-suite cli-tests
    , unison-codebase-sqlite
    , unison-codebase-sqlite-hashing-v2
    , unison-core1
+    , unison-hash
    , unison-parser-typechecker
    , unison-prelude
    , unison-pretty-printer
--- a/unison-core/package.yaml
+++ b/unison-core/package.yaml
@ -26,6 +26,7 @@ library:
    - text
    - transformers
    - unison-core
+    - unison-hash
    - unison-prelude
    - unison-util
    - unison-util-base32hex
--- a/unison-core/unison-core1.cabal
+++ b/unison-core/unison-core1.cabal
@ -31,7 +31,6 @@ library
      Unison.DataDeclaration
      Unison.DataDeclaration.ConstructorId
      Unison.DataDeclaration.Names
-      Unison.Hash
      Unison.Hashable
      Unison.HashQualified
      Unison.HashQualified'
@ -104,6 +103,7 @@ library
    , text
    , transformers
    , unison-core
+    , unison-hash
    , unison-prelude
    , unison-util
    , unison-util-base32hex
--- a/unison-hashing-v2/package.yaml
+++ b/unison-hashing-v2/package.yaml
@ -14,6 +14,7 @@ dependencies:
  - semialign
  - text
  - unison-core1
+  - unison-hash
  - unison-prelude
  - unison-util
  - unison-util-base32hex
--- a/unison-hashing-v2/unison-hashing-v2.cabal
+++ b/unison-hashing-v2/unison-hashing-v2.cabal
@ -71,6 +71,7 @@ library
    , semialign
    , text
    , unison-core1
+    , unison-hash
    , unison-prelude
    , unison-util
    , unison-util-base32hex
--- a/unison-share-api/package.yaml
+++ b/unison-share-api/package.yaml
@ -43,12 +43,13 @@ dependencies:
  - unison-codebase
  - unison-codebase-sqlite
  - unison-core1
+  - unison-hash
+  - unison-hash-orphans-aeson
  - unison-parser-typechecker
  - unison-prelude
  - unison-pretty-printer
  - unison-util
  - unison-util-base32hex
-  - unison-util-base32hex-orphans-aeson
  - unison-util-relation
  - unison-sqlite
  - unison-syntax
--- a/unison-share-api/unison-share-api.cabal
+++ b/unison-share-api/unison-share-api.cabal
@ -102,6 +102,8 @@ library
    , unison-codebase
    , unison-codebase-sqlite
    , unison-core1
+    , unison-hash
+    , unison-hash-orphans-aeson
    , unison-parser-typechecker
    , unison-prelude
    , unison-pretty-printer
@ -109,7 +111,6 @@ library
    , unison-syntax
    , unison-util
    , unison-util-base32hex
-    , unison-util-base32hex-orphans-aeson
    , unison-util-relation
    , unliftio
    , unordered-containers
--- a/unison-syntax/package.yaml
+++ b/unison-syntax/package.yaml
@ -14,6 +14,7 @@ dependencies:
  - mtl
  - text
  - unison-core1
+  - unison-hash
  - unison-prelude
  - unison-util-base32hex
  - unison-util-bytes
--- a/unison-syntax/unison-syntax.cabal
+++ b/unison-syntax/unison-syntax.cabal
@ -67,6 +67,7 @@ library
    , mtl
    , text
    , unison-core1
+    , unison-hash
    , unison-prelude
    , unison-util-base32hex
    , unison-util-bytes
@ -119,6 +120,7 @@ test-suite syntax-tests
    , mtl
    , text
    , unison-core1
+    , unison-hash
    , unison-prelude
    , unison-syntax
    , unison-util-base32hex