update build to work with aeson >= 2.0 and text >= 2.0 (#209)

Fixes #208 by updating stack, cabal, and nix versions, and making the necessary changes to the codebase.

Author: jeicher

cas/hashable/cas-hashable.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.34.7.
 --
 -- see: https://github.com/sol/hpack
 
 name:           cas-hashable
-version:        1.0.1
+version:        1.0.2
 synopsis:       A hashing class for content-addressed storage
 description:    A hashing class for content-addressed storage. Content can be hashed either by value or through an IO action. Part of the funflow ecosystem.
 category:       Control
@@ -32,21 +32,21 @@ library
       src
   ghc-options: -Wall
   build-depends:
-      aeson
+      aeson >=2.1.0 && <2.2
     , base >=4.9 && <5
     , bytestring
     , clock
     , containers
     , cryptonite
     , ghc-prim
-    , hashable
+    , hashable >=1.4.1 && <1.5
     , integer-gmp
     , memory
     , path
     , path-io
     , safe-exceptions
     , scientific
-    , text
+    , text >=2.0.1 && <2.1
     , time
     , unix
     , unordered-containers
@@ -61,22 +61,22 @@ test-suite perf
   hs-source-dirs:
       app
   build-depends:
-      aeson
+      aeson >=2.1.0 && <2.2
     , base >=4.6 && <5
     , bytestring
     , cas-hashable
     , clock
     , containers
     , cryptonite
     , ghc-prim
-    , hashable
+    , hashable >=1.4.1 && <1.5
     , integer-gmp
     , memory
     , path
     , path-io
     , safe-exceptions
     , scientific
-    , text
+    , text >=2.0.1 && <2.1
     , time
     , unix
     , unordered-containers

cas/hashable/package.yaml

@@ -1,5 +1,5 @@
 name: cas-hashable
-version: 1.0.1
+version: 1.0.2
 synopsis: A hashing class for content-addressed storage
 description: A hashing class for content-addressed storage. Content can be hashed either by value or through an IO action. Part of the funflow ecosystem.
 license: MIT
@@ -12,21 +12,21 @@ author: Tom Nielsen, Nicholas Clarke, Andreas Herrmann
 ghc-options: -Wall
 
 dependencies:
-  - base >= 4.9 && < 5
-  - aeson
+  - base                          >= 4.9 && < 5
+  - aeson                         >= 2.1.0 && < 2.2
   - bytestring
   - clock
   - containers
   - cryptonite
   - ghc-prim
-  - hashable
+  - hashable                      >= 1.4.1 && < 1.5
   - integer-gmp
   - memory
   - path
   - path-io
   - safe-exceptions
   - scientific
-  - text
+  - text                          >= 2.0.1 && < 2.1
   - time
   - unix
   - unordered-containers
@@ -45,4 +45,4 @@ tests:
       - -rtsopts -O2
     dependencies:
       - base >=4.6 && <5
-      - cas-hashable
+      - cas-hashable

cas/hashable/src/Data/CAS/ContentHashable.hs

@@ -10,6 +10,8 @@
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE UnboxedTuples #-}
+{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
+{-# HLINT ignore "Use camelCase" #-}
 
 -- | 'ContentHashable' provides a hashing function suitable for use in the
 --   Funflow content store.
@@ -59,7 +61,8 @@ import Crypto.Hash
   )
 import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Types as Aeson
-import Data.Bits (shiftL)
+import qualified Data.Aeson.KeyMap as Aeson
+import qualified Data.Aeson.Key as Aeson
 import Data.ByteArray
   ( Bytes,
     MemView (MemView),
@@ -249,11 +252,9 @@ contentHashUpdate_byteArray# ba (I# off) (I# len) ctx = hashUpdate ctx $
 
 -- | Update hash context based on the contents of a strict 'Data.Text.Text'.
 contentHashUpdate_text :: Context SHA256 -> T.Text -> Context SHA256
-contentHashUpdate_text ctx (T.Text arr off_ len_) =
-  contentHashUpdate_byteArray# (TA.aBA arr) off len ctx
-  where
-    off = off_ `shiftL` 1 -- convert from 'Word16' to 'Word8'
-    len = len_ `shiftL` 1 -- convert from 'Word16' to 'Word8'
+contentHashUpdate_text ctx (T.Text (TA.ByteArray arr) off len) =
+  contentHashUpdate_byteArray# arr off len ctx
+
 
 instance Monad m => ContentHashable m Fingerprint where
   contentHashUpdate ctx (Fingerprint a b) = flip contentHashUpdate_storable a >=> flip contentHashUpdate_storable b $ ctx
@@ -443,6 +444,12 @@ instance (ContentHashable m a, ContentHashable m b) => ContentHashable m (Either
 
 instance Monad m => ContentHashable m Aeson.Value
 
+instance Monad m => ContentHashable m (Aeson.KeyMap Aeson.Value) where
+  contentHashUpdate ctx m = contentHashUpdate ctx (Aeson.toList m)
+
+instance Monad m => ContentHashable m Aeson.Key where
+  contentHashUpdate ctx k = contentHashUpdate ctx (Aeson.toText k)
+
 class Monad m => GContentHashable m f where
   gContentHashUpdate :: Context SHA256 -> f a -> m (Context SHA256)
 

cas/s3/cas-hashable-s3.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.34.7.
 --
 -- see: https://github.com/sol/hpack
 
 name:           cas-hashable-s3
-version:        1.0.0
+version:        1.0.1
 synopsis:       ContentHashable instances for S3 objects
 description:    Provides ContentHashable instances for S3 objects
 category:       Control
@@ -30,7 +30,7 @@ library
       src
   ghc-options: -Wall
   build-depends:
-      aeson
+      aeson >=2.0
     , aws
     , base >=4.9 && <5
     , cas-hashable

cas/s3/package.yaml

@@ -1,5 +1,5 @@
 name: cas-hashable-s3
-version: 1.0.0
+version: 1.0.1
 synopsis: ContentHashable instances for S3 objects
 description: Provides ContentHashable instances for S3 objects
 license: MIT
@@ -13,7 +13,7 @@ ghc-options: -Wall
 
 dependencies:
   - base >= 4.9 && < 5
-  - aeson
+  - aeson >= 2.0
   - aws
   - cas-hashable
   - constraints

cas/store/cas-store.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.34.7.
 --
 -- see: https://github.com/sol/hpack
 
 name:           cas-store
-version:        1.1.0
+version:        1.1.1
 synopsis:       A content-addressed storage
 description:    A content-addressed storage supporting a remote caching. The API mainly consists of the cacheKleisliIO function which takes a (a -> m b) function and runs it only if the store doesn't already contain a result for it. Part of the funflow ecosystem.
 category:       Control
@@ -35,7 +35,7 @@ library
       src
   ghc-options: -Wall
   build-depends:
-      aeson
+      aeson >=2.1.0 && <2.2
     , async
     , base >=4.9 && <5
     , bytestring
@@ -44,17 +44,17 @@ library
     , cryptonite
     , directory
     , filepath
-    , hashable
+    , hashable >=1.4.1 && <1.5
     , hostname
-    , lens
+    , lens >=5.2
     , path
     , path-io
     , random
     , safe-exceptions
     , sqlite-simple
     , store
     , tar
-    , text
+    , text >=2.0.1 && <2.1
     , unix
     , unliftio
   if os(linux)
@@ -82,7 +82,7 @@ test-suite unit-tests
       test
   ghc-options: -Wall -Wall -threaded
   build-depends:
-      aeson
+      aeson >=2.1.0 && <2.2
     , async
     , base
     , bytestring
@@ -92,9 +92,9 @@ test-suite unit-tests
     , cryptonite
     , directory
     , filepath
-    , hashable
+    , hashable >=1.4.1 && <1.5
     , hostname
-    , lens
+    , lens >=5.2
     , path
     , path-io
     , random
@@ -104,7 +104,7 @@ test-suite unit-tests
     , tar
     , tasty
     , tasty-hunit
-    , text
+    , text >=2.0.1 && <2.1
     , unix
     , unliftio
   default-language: Haskell2010

cas/store/package.yaml

@@ -1,5 +1,5 @@
 name: cas-store
-version: 1.1.0
+version: 1.1.1
 synopsis: A content-addressed storage
 description: A content-addressed storage supporting a remote caching. The API mainly consists of the cacheKleisliIO function which takes a (a -> m b) function and runs it only if the store doesn't already contain a result for it. Part of the funflow ecosystem.
 license: MIT
@@ -12,26 +12,26 @@ author: Tom Nielsen, Nicholas Clarke, Andreas Herrmann
 ghc-options: -Wall
 
 dependencies:
-  - base >= 4.9 && < 5
-  - aeson
+  - base                          >= 4.9 && < 5
+  - aeson                         >= 2.1.0 && < 2.2
   - async
   - bytestring
   - cas-hashable
   - containers
   - cryptonite
   - directory
   - filepath
-  - hashable
+  - hashable                      >= 1.4.1 && < 1.5
   - hostname
-  - lens
+  - lens                          >= 5.2
   - path
   - path-io
   - random
   - safe-exceptions
   - sqlite-simple
   - store
   - tar
-  - text
+  - text                          >= 2.0.1 && < 2.1
   - unix
   - unliftio
 

cas/store/src/Data/CAS/ContentStore.hs

@@ -174,7 +174,7 @@ import qualified Database.SQLite.Simple.FromField as SQL
 import qualified Database.SQLite.Simple.ToField as SQL
 import GHC.Generics (Generic)
 import Path
-import Path.IO
+import Path.IO hiding (removePathForcibly)
 import System.Directory (removePathForcibly)
 import System.FilePath (dropTrailingPathSeparator)
 import System.IO
@@ -261,7 +261,7 @@ instance Exception StoreError where
         ++ ". No automatic migration is available, \
            \please use a fresh store location."
     MalformedMetadataEntry hash key ->
-      "The metadtaa entry for hash '"
+      "The metadata entry for hash '"
         ++ C8.unpack (encodeHash hash)
         ++ "' under key '"
         ++ show key
@@ -272,18 +272,18 @@ data ContentStore = ContentStore
   { -- | Root directory of the content store.
     -- The process must be able to create this directory if missing,
     -- change permissions, and create files and directories within.
-    storeRoot :: Path Abs Dir,
+    storeRoot :: !(Path Abs Dir),
     -- | Write lock on store metadata to ensure multi thread and process safety.
     -- The lock is taken when item state is changed or queried.
-    storeLock :: Lock,
+    storeLock :: !Lock,
     -- | Used to watch for updates on store items.
-    storeNotifier :: Notifier,
+    storeNotifier :: !Notifier,
     -- | Connection to the metadata SQLite database.
-    storeDb :: SQL.Connection
+    storeDb :: !SQL.Connection
   }
 
 -- | A completed item in the 'ContentStore'.
-data Item = Item {itemHash :: ContentHash}
+newtype Item = Item {itemHash :: ContentHash}
   deriving (Eq, Ord, Show, Generic)
 
 instance Monad m => ContentHashable m Item where
@@ -716,13 +716,13 @@ removeAlias store alias =
         [":hash" SQL.:= hash]
 
 -- | List all aliases and the respective items.
-listAliases :: MonadIO m => ContentStore -> m [(Alias, Item)]
+listAliases :: MonadIO m => ContentStore -> m [(Alias, Item, ContentHash)]
 listAliases store =
   liftIO . withStoreLock store $
-    fmap (map (second Item)) $
+    map (\(a,b,c) -> (a, Item b, c)) <$>
       SQL.query_
         (storeDb store)
-        "SELECT name, dest FROM aliases"
+        "SELECT name, dest, hash FROM aliases"
 
 -- | Get all hashes that resulted in the given item.
 getBackReferences :: MonadIO m => ContentStore -> Item -> m [ContentHash]

cas/store/test/CAS/ContentStore.hs

@@ -301,7 +301,7 @@ tests =
       testCase "list store contents" $
         withEmptyStore $ \store -> do
           [a, b, c, d] <- mapM contentHash ["a", "b", "c", "d" :: String]
-          void $ mapM (ContentStore.markPending store) [a, b, c, d]
+          mapM_ (ContentStore.markPending store) [a, b, c, d]
           mapM_ (ContentStore.markComplete store) [a, b]
 
           (pendings, completes, items) <- ContentStore.listAll store
@@ -341,6 +341,16 @@ tests =
 
           ContentStore.assignAlias store aliasA itemA
           ContentStore.assignAlias store aliasB itemB
+
+          do 
+            lr <- ContentStore.listAliases store
+            length lr @?= 2
+            ((\(a,b,c) -> a) <$> lr) @?= [aliasA, aliasB]
+            ((\(_,b,_) -> b) <$> lr) @?= [itemA, itemB]
+            hashA <- contentHash aliasA
+            hashB <- contentHash aliasB
+            ((\(_,_,c) -> c) <$> lr) @?= [hashA, hashB]
+
           do
             r <- ContentStore.lookupAlias store aliasA
             r @?= Just itemA