From ddc83d4c557b17b5b414d97f8429eaa2f3842c22 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 20 Nov 2024 14:03:31 -0700 Subject: [PATCH 1/4] start persistent-sql-lifted package --- freckle-app/CHANGELOG.md | 15 ++++- freckle-app/freckle-app.cabal | 3 +- freckle-app/library/Freckle/App/Database.hs | 28 +------- freckle-app/package.yaml | 3 +- hie.yaml | 21 +++--- persistent-sql-lifted/CHANGELOG.md | 5 ++ persistent-sql-lifted/README.md | 13 ++++ .../library/Database/Persist/Sql/Lifted.hs | 10 +++ .../Persist/Sql/Lifted/HasSqlBackend.hs | 13 ++++ .../Persist/Sql/Lifted/MonadSqlBackend.hs | 25 ++++++++ .../Database/Persist/Sql/Lifted/MonadSqlTx.hs | 15 +++++ persistent-sql-lifted/package.yaml | 64 +++++++++++++++++++ .../persistent-sql-lifted.cabal | 58 +++++++++++++++++ stack-lts-20.26.yaml | 1 + stack-lts-21.25.yaml | 1 + stack-nightly.yaml | 1 + stack.yaml | 1 + 17 files changed, 238 insertions(+), 39 deletions(-) create mode 100644 persistent-sql-lifted/CHANGELOG.md create mode 100644 persistent-sql-lifted/README.md create mode 100644 persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs create mode 100644 persistent-sql-lifted/library/Database/Persist/Sql/Lifted/HasSqlBackend.hs create mode 100644 persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlBackend.hs create mode 100644 persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlTx.hs create mode 100644 persistent-sql-lifted/package.yaml create mode 100644 persistent-sql-lifted/persistent-sql-lifted.cabal diff --git a/freckle-app/CHANGELOG.md b/freckle-app/CHANGELOG.md index 3254c42..a2e102f 100644 --- a/freckle-app/CHANGELOG.md +++ b/freckle-app/CHANGELOG.md @@ -1,4 +1,17 @@ -## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.3.0...main) +## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.21.0.0...main) + +## [v1.21.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-vv1.20.3.0...freckle-app-v1.21.0.0) + +The following have moved from `Freckle.App.Database` to a new package, `persistent-sql-lifted`: + +- `MonadSqlTx (..)` +- `HasSqlBackend (..)` +- `MonadSqlBackend (..)` +- `liftSql` + +The definitions in `freckle-app` have been replaced with reëxports, +so no code needs to change for users, except that a dependency on +the `persistent-sql-lifted` package is now required. ## [v1.20.3.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.2.1...freckle-app-v1.20.3.0) diff --git a/freckle-app/freckle-app.cabal b/freckle-app/freckle-app.cabal index f9fe509..50fc14a 100644 --- a/freckle-app/freckle-app.cabal +++ b/freckle-app/freckle-app.cabal @@ -5,7 +5,7 @@ cabal-version: 1.22 -- see: https://github.com/sol/hpack name: freckle-app -version: 1.20.3.0 +version: 1.21.0.0 synopsis: Haskell application toolkit used at Freckle description: Please see README.md category: Utils @@ -147,6 +147,7 @@ library , path-pieces , persistent , persistent-postgresql + , persistent-sql-lifted , postgresql-simple , primitive , resource-pool >=0.4.0.0 diff --git a/freckle-app/library/Freckle/App/Database.hs b/freckle-app/library/Freckle/App/Database.hs index ab5030d..d212445 100644 --- a/freckle-app/library/Freckle/App/Database.hs +++ b/freckle-app/library/Freckle/App/Database.hs @@ -56,6 +56,7 @@ import Database.Persist.Postgresql , runSqlPool , runSqlPoolWithExtensibleHooks ) +import Database.Persist.Sql.Lifted import Database.Persist.SqlBackend.Internal.SqlPoolHooks (SqlPoolHooks (..)) import Database.Persist.SqlBackend.SqlPoolHooks import Database.PostgreSQL.Simple @@ -67,7 +68,6 @@ import Database.PostgreSQL.Simple import Database.PostgreSQL.Simple.SqlQQ (sql) import Freckle.App.Env (Timeout (..)) import Freckle.App.Env qualified as Env -import Freckle.App.Exception.MonadUnliftIO import Freckle.App.OpenTelemetry import Freckle.App.Stats (HasStatsClient) import Freckle.App.Stats qualified as Stats @@ -78,32 +78,6 @@ import UnliftIO.Concurrent (threadDelay) import UnliftIO.IORef import Yesod.Core.Types (HandlerData (..), RunHandlerEnv (..)) --- | A monadic context in which a SQL backend is available --- for running database queries -class MonadUnliftIO m => MonadSqlBackend m where - getSqlBackendM :: m SqlBackend - -instance (HasSqlBackend r, MonadUnliftIO m) => MonadSqlBackend (ReaderT r m) where - getSqlBackendM = asks getSqlBackend - --- | Generalize from 'SqlPersistT' to 'MonadSqlBackend' -liftSql :: (MonadSqlBackend m, HasCallStack) => ReaderT SqlBackend m a -> m a -liftSql (ReaderT f) = checkpointCallStack $ getSqlBackendM >>= f - --- | The constraint @'MonadSqlTx' db m@ indicates that @m@ is a monadic --- context that can run @db@ actions, usually as a SQL transaction. --- Typically, this means that @db@ needs a connection and @m@ can --- provide one, e.g. from a connection pool. -class (MonadSqlBackend db, MonadUnliftIO m) => MonadSqlTx db m | m -> db where - -- | Runs the action in a SQL transaction - runSqlTx :: HasCallStack => db a -> m a - -class HasSqlBackend a where - getSqlBackend :: a -> SqlBackend - -instance HasSqlBackend SqlBackend where - getSqlBackend = id - type SqlPool = Pool SqlBackend class HasSqlPool app where diff --git a/freckle-app/package.yaml b/freckle-app/package.yaml index cd6de85..505b870 100644 --- a/freckle-app/package.yaml +++ b/freckle-app/package.yaml @@ -1,5 +1,5 @@ name: freckle-app -version: 1.20.3.0 +version: 1.21.0.0 maintainer: Freckle Education category: Utils @@ -124,6 +124,7 @@ library: - openapi3 - path-pieces - persistent + - persistent-sql-lifted - persistent-postgresql - postgresql-simple - primitive diff --git a/hie.yaml b/hie.yaml index 2a05fd3..92916f7 100644 --- a/hie.yaml +++ b/hie.yaml @@ -1,7 +1,7 @@ cradle: - cabal: + stack: - path: "freckle-app/library" - component: "lib:freckle-app" + component: "freckle-app:lib" - path: "freckle-app/doctest" component: "freckle-app:test:doctest" @@ -10,34 +10,37 @@ cradle: component: "freckle-app:test:spec" - path: "freckle-env/library" - component: "lib:freckle-env" + component: "freckle-env:lib" - path: "freckle-env/doctest" component: "freckle-env:test:doctest" - path: "freckle-exception/library" - component: "lib:freckle-exception" + component: "freckle-exception:lib" - path: "freckle-http/library" - component: "lib:freckle-http" + component: "freckle-http:lib" - path: "freckle-http/tests" component: "freckle-http:test:spec" - path: "freckle-kafka/library" - component: "lib:freckle-kafka" + component: "freckle-kafka:lib" - path: "freckle-memcached/library" - component: "lib:freckle-memcached" + component: "freckle-memcached:lib" - path: "freckle-memcached/tests" component: "freckle-memcached:test:spec" - path: "freckle-otel/library" - component: "lib:freckle-otel" + component: "freckle-otel:lib" - path: "freckle-otel/tests" component: "freckle-otel:test:spec" - path: "freckle-prelude/library" - component: "lib:freckle-prelude" + component: "freckle-prelude:lib" + + - path: "persistent-sql-lifted/library" + component: "persistent-sql-lifted:lib" diff --git a/persistent-sql-lifted/CHANGELOG.md b/persistent-sql-lifted/CHANGELOG.md new file mode 100644 index 0000000..2a67179 --- /dev/null +++ b/persistent-sql-lifted/CHANGELOG.md @@ -0,0 +1,5 @@ +## [_Unreleased_](https://github.com/freckle/freckle-app/compare/persistent-sql-lifted-v0.0.0.0...main) + +## [v0.0.0.0](https://github.com/freckle/freckle-app/tree/persistent-sql-lifted-v0.0.0.0/persistent-sql-lifted) + +First release, sprouted from `freckle-app-1.20.3.0`. diff --git a/persistent-sql-lifted/README.md b/persistent-sql-lifted/README.md new file mode 100644 index 0000000..1e8b927 --- /dev/null +++ b/persistent-sql-lifted/README.md @@ -0,0 +1,13 @@ +# persistent-sql-lifted + +How to migrate from vanilla [persistent]: + +- Instead of [SqlPersistT], use a `MonadSqlBackend` constraint. +- Define an instance of `MonadSqlTx` for your application Monad that specifies how + your application runs database transactions, e.g. by running [runSqlPool]. +- Instead of calling `runSqlPool` directly from the rest of your application code, + use the `runSqlTx` method from the `MonadSqlTx` class. + + [persistent]: https://hackage.haskell.org/package/persistent + [SqlPersistT]: https://hackage.haskell.org/package/persistent-2.14.6.3/docs/Database-Persist-Sql.html#t:SqlPersistT + [runSqlPool]: https://hackage.haskell.org/package/persistent-2.14.6.3/docs/Database-Persist-Sql.html#v:runSqlPool diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs new file mode 100644 index 0000000..abd5247 --- /dev/null +++ b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs @@ -0,0 +1,10 @@ +module Database.Persist.Sql.Lifted + ( MonadSqlTx (..) + , HasSqlBackend (..) + , MonadSqlBackend (..) + , liftSql + ) where + +import Database.Persist.Sql.Lifted.HasSqlBackend +import Database.Persist.Sql.Lifted.MonadSqlBackend +import Database.Persist.Sql.Lifted.MonadSqlTx diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/HasSqlBackend.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/HasSqlBackend.hs new file mode 100644 index 0000000..ac31cd9 --- /dev/null +++ b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/HasSqlBackend.hs @@ -0,0 +1,13 @@ +module Database.Persist.Sql.Lifted.HasSqlBackend + ( HasSqlBackend (..) + ) where + +import Prelude + +import Database.Persist.Sql (SqlBackend) + +class HasSqlBackend a where + getSqlBackend :: a -> SqlBackend + +instance HasSqlBackend SqlBackend where + getSqlBackend = id diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlBackend.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlBackend.hs new file mode 100644 index 0000000..7352395 --- /dev/null +++ b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlBackend.hs @@ -0,0 +1,25 @@ +module Database.Persist.Sql.Lifted.MonadSqlBackend + ( MonadSqlBackend (..) + , liftSql + ) where + +import Prelude + +import Control.Exception.Annotated.UnliftIO (checkpointCallStack) +import Control.Monad.IO.Unlift (MonadUnliftIO) +import Control.Monad.Reader (ReaderT (..), asks) +import Database.Persist.Sql (SqlBackend) +import Database.Persist.Sql.Lifted.HasSqlBackend (HasSqlBackend, getSqlBackend) +import GHC.Stack (HasCallStack) + +-- | A monadic context in which a SQL backend is available +-- for running database queries +class MonadUnliftIO m => MonadSqlBackend m where + getSqlBackendM :: m SqlBackend + +instance (HasSqlBackend r, MonadUnliftIO m) => MonadSqlBackend (ReaderT r m) where + getSqlBackendM = asks getSqlBackend + +-- | Generalize from 'SqlPersistT' to 'MonadSqlBackend' +liftSql :: (MonadSqlBackend m, HasCallStack) => ReaderT SqlBackend m a -> m a +liftSql (ReaderT f) = checkpointCallStack $ getSqlBackendM >>= f diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlTx.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlTx.hs new file mode 100644 index 0000000..bdcef46 --- /dev/null +++ b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/MonadSqlTx.hs @@ -0,0 +1,15 @@ +module Database.Persist.Sql.Lifted.MonadSqlTx + ( MonadSqlTx (..) + ) where + +import Control.Monad.IO.Unlift (MonadUnliftIO) +import Database.Persist.Sql.Lifted.MonadSqlBackend (MonadSqlBackend) +import GHC.Stack (HasCallStack) + +-- | The constraint @'MonadSqlTx' db m@ indicates that @m@ is a monadic +-- context that can run @db@ actions, usually as a SQL transaction. +-- Typically, this means that @db@ needs a connection and @m@ can +-- provide one, e.g. from a connection pool. +class (MonadSqlBackend db, MonadUnliftIO m) => MonadSqlTx db m | m -> db where + -- | Runs the action in a SQL transaction + runSqlTx :: HasCallStack => db a -> m a diff --git a/persistent-sql-lifted/package.yaml b/persistent-sql-lifted/package.yaml new file mode 100644 index 0000000..b034e68 --- /dev/null +++ b/persistent-sql-lifted/package.yaml @@ -0,0 +1,64 @@ +name: persistent-sql-lifted +version: 1.20.3.0 + +maintainer: Freckle Education +category: Utils +github: freckle/freckle-app +synopsis: ... +description: Please see README.md + +extra-doc-files: + - README.md + - CHANGELOG.md + +extra-source-files: + - package.yaml + +language: GHC2021 + +ghc-options: + - -fignore-optim-changes + - -fwrite-ide-info + - -Weverything + - -Wno-all-missed-specialisations + - -Wno-missing-exported-signatures # re-enables missing-signatures + - -Wno-missing-import-lists + - -Wno-missing-kind-signatures + - -Wno-missing-local-signatures + - -Wno-missing-safe-haskell-mode + - -Wno-monomorphism-restriction + - -Wno-prepositive-qualified-module + - -Wno-safe + - -Wno-unsafe + +when: + - condition: "impl(ghc >= 9.8)" + ghc-options: + - -Wno-missing-role-annotations + - -Wno-missing-poly-kind-signatures + +dependencies: + - base < 5 + +default-extensions: + - DataKinds + - DeriveAnyClass + - DerivingVia + - DerivingStrategies + - FunctionalDependencies + - GADTs + - LambdaCase + - NoImplicitPrelude + - NoMonomorphismRestriction + - OverloadedStrings + - RecordWildCards + - TypeFamilies + +library: + source-dirs: library + dependencies: + - annotated-exception + - base + - mtl + - persistent + - unliftio-core diff --git a/persistent-sql-lifted/persistent-sql-lifted.cabal b/persistent-sql-lifted/persistent-sql-lifted.cabal new file mode 100644 index 0000000..33ebdfe --- /dev/null +++ b/persistent-sql-lifted/persistent-sql-lifted.cabal @@ -0,0 +1,58 @@ +cabal-version: 1.18 + +-- This file has been generated from package.yaml by hpack version 0.36.0. +-- +-- see: https://github.com/sol/hpack + +name: persistent-sql-lifted +version: 1.20.3.0 +synopsis: ... +description: Please see README.md +category: Utils +homepage: https://github.com/freckle/freckle-app#readme +bug-reports: https://github.com/freckle/freckle-app/issues +maintainer: Freckle Education +build-type: Simple +extra-source-files: + package.yaml +extra-doc-files: + README.md + CHANGELOG.md + +source-repository head + type: git + location: https://github.com/freckle/freckle-app + +library + exposed-modules: + Database.Persist.Sql.Lifted + Database.Persist.Sql.Lifted.HasSqlBackend + Database.Persist.Sql.Lifted.MonadSqlBackend + Database.Persist.Sql.Lifted.MonadSqlTx + other-modules: + Paths_persistent_sql_lifted + hs-source-dirs: + library + default-extensions: + DataKinds + DeriveAnyClass + DerivingVia + DerivingStrategies + FunctionalDependencies + GADTs + LambdaCase + NoImplicitPrelude + NoMonomorphismRestriction + OverloadedStrings + RecordWildCards + TypeFamilies + ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-local-signatures -Wno-missing-safe-haskell-mode -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-safe -Wno-unsafe + build-depends: + annotated-exception + , base + , mtl + , persistent + , unliftio-core + default-language: GHC2021 + if impl(ghc >= 9.8) + ghc-options: -Wno-missing-role-annotations -Wno-missing-poly-kind-signatures diff --git a/stack-lts-20.26.yaml b/stack-lts-20.26.yaml index 22587df..0098624 100644 --- a/stack-lts-20.26.yaml +++ b/stack-lts-20.26.yaml @@ -42,3 +42,4 @@ packages: - freckle-memcached - freckle-otel - freckle-prelude + - persistent-sql-lifted diff --git a/stack-lts-21.25.yaml b/stack-lts-21.25.yaml index 3567910..1780268 100644 --- a/stack-lts-21.25.yaml +++ b/stack-lts-21.25.yaml @@ -38,3 +38,4 @@ packages: - freckle-memcached - freckle-otel - freckle-prelude + - persistent-sql-lifted diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 1506b5a..1a87064 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -89,3 +89,4 @@ packages: - freckle-memcached - freckle-otel - freckle-prelude + - persistent-sql-lifted diff --git a/stack.yaml b/stack.yaml index ec8026a..dc43cc4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -33,3 +33,4 @@ packages: - freckle-memcached - freckle-otel - freckle-prelude + - persistent-sql-lifted From 88cc348253b9c33df825d538a5edfe6e16c32c19 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Wed, 20 Nov 2024 16:21:27 -0700 Subject: [PATCH 2/4] bump nightly resolver --- stack-nightly.yaml | 88 ++++------- stack-nightly.yaml.lock | 319 ++++++++++++++++++++-------------------- 2 files changed, 184 insertions(+), 223 deletions(-) diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 1a87064..723f792 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,84 +1,52 @@ -resolver: nightly-2024-09-19 +resolver: nightly-2024-10-11 extra-deps: - - Blammo-2.1.0.0 - - Blammo-wai-0.0.0.2 - bcp47-0.2.0.6 - - fast-logger-3.2.3 - - monad-validate-1.3.0.0 - - # For OTel - - hs-opentelemetry-api-0.1.0.0 - - hs-opentelemetry-exporter-otlp-0.0.1.5 - - hs-opentelemetry-instrumentation-persistent-0.1.0.0 - - hs-opentelemetry-instrumentation-wai-0.1.0.0 - - hs-opentelemetry-otlp-0.0.1.0 - - hs-opentelemetry-propagator-b3-0.0.1.1 - - hs-opentelemetry-propagator-w3c-0.0.1.3 - - hs-opentelemetry-sdk-0.0.3.6 - - thread-utils-context-0.3.0.4 - - thread-utils-finalizers-0.1.1.0 - - # These are me just adding what Stack told me to - - Cabal-3.10.2.1 - - Cabal-syntax-3.10.2.0 - binary-0.8.9.1 + - Blammo-2.1.0.0 + - Blammo-wai-0.0.0.2 - buffer-builder-0.2.4.8 - bytebuild-0.3.15.0 - bytehash-0.1.1.1 - byteslice-0.2.13.0 - bytestring-0.11.5.3 + - Cabal-3.10.3.0 + - Cabal-syntax-3.10.3.0 + - containers-0.7 - contiguous-0.6.4.0 - country-0.2.4.1 - datadog-0.3.0.0 - deepseq-1.4.8.1 - - ekg-core-0.1.1.7 + - doctest-0.22.10 + - directory-1.3.9.0 + - ekg-core-0.1.1.8 + - fast-logger-3.2.3 + - filepath-1.4.301.0 + - hs-opentelemetry-api-0.1.0.0 + - hs-opentelemetry-exporter-otlp-0.0.1.5 + - hs-opentelemetry-instrumentation-persistent-0.1.0.0 + - hs-opentelemetry-instrumentation-wai-0.1.0.0 + - hs-opentelemetry-otlp-0.0.1.0 + - hs-opentelemetry-propagator-b3-0.0.1.1 + - hs-opentelemetry-propagator-w3c-0.0.1.3 + - hs-opentelemetry-sdk-0.0.3.6 + - monad-validate-1.3.0.0 - parsec-3.1.17.0 - pretty-1.1.3.6 - - primitive-0.9.0.0 - - primitive-unlifted-2.1.0.0 - - process-1.6.18.0 - - proto-lens-0.7.1.4 - - proto-lens-runtime-0.7.0.5 - - run-st-0.1.3.2 - - time-1.12.2 - - # This I had to hold back because buffer-builder's imports are wrong for 2.1 - - text-2.0 - - # This I had to hold back because 2.8.5.0 doesn't build + - time-compat-1.9.7 + - process-1.6.25.0 + - text-2.0.2 # buffer-builder-0.2.4.8 requires text < 2.1 + - thread-utils-context-0.3.0.4 + - thread-utils-finalizers-0.1.1.0 - unix-2.8.4.0 - - # These I had to futz with to get everyone happy with unix-2.8.4.0 - - containers-0.6.8 - - directory-1.3.8.1 - - filepath-1.4.200.1 + - yaml-0.11.11.2 + - yesod-core-1.6.26.0 + - time-1.12.2 allow-newer: true allow-newer-deps: - - Cabal - - Cabal-syntax - - aeson - - binary - country - deepseq - - ekg-core - - entropy - - http-api-data - - http2 - - indexed-traversable - - integer-conversion - - lens - - lens-family - - lens-family-core - - parsec - - postgresql-simple - - proto-lens - - proto-lens-runtime - - scientific - - semialign - text - - time - - witherable packages: - freckle-app diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock index f0989d4..b674176 100644 --- a/stack-nightly.yaml.lock +++ b/stack-nightly.yaml.lock @@ -4,6 +4,20 @@ # https://docs.haskellstack.org/en/stable/lock_files packages: +- completed: + hackage: bcp47-0.2.0.6@sha256:9071d1f97ef249ae62e4554e3cba892cd6059ac263271fd72635157c83743a30,2949 + pantry-tree: + sha256: 3cd17d04bc9d13c8ba7e8e390973fce7d79003b18379533c8ce702f9ad3f82b3 + size: 1498 + original: + hackage: bcp47-0.2.0.6 +- completed: + hackage: binary-0.8.9.1@sha256:81f468c1c75fd6535152ab69b2d32ac6cfcc03e345267b069abe4da56ec95801,6523 + pantry-tree: + sha256: 956ecd662408f69615977b87a92e042abcdc447b7824b8aabf5788c4393c10c5 + size: 1976 + original: + hackage: binary-0.8.9.1 - completed: hackage: Blammo-2.1.0.0@sha256:cb974555dfe850cbc4f174a0a4443883b776b1e93c1d4b37249fb6081cb286de,4755 pantry-tree: @@ -19,191 +33,191 @@ packages: original: hackage: Blammo-wai-0.0.0.2 - completed: - hackage: bcp47-0.2.0.6@sha256:9071d1f97ef249ae62e4554e3cba892cd6059ac263271fd72635157c83743a30,2949 + hackage: buffer-builder-0.2.4.8@sha256:37d8a5c384aa54d01d78dc18277a936ffcfd4194bad15d20b42fb2dc98fb89b7,5223 pantry-tree: - sha256: 3cd17d04bc9d13c8ba7e8e390973fce7d79003b18379533c8ce702f9ad3f82b3 - size: 1498 + sha256: 95c337267de6ca12d5ed8c52b275198df6d7afb30c913d81bfe4169f8dbf2b9a + size: 1155 original: - hackage: bcp47-0.2.0.6 + hackage: buffer-builder-0.2.4.8 - completed: - hackage: fast-logger-3.2.3@sha256:41b4f1c07d5ee4a7cc785689eb7772554d29ddbbcced3cc184fe50fc63ece3f7,2176 + hackage: bytebuild-0.3.15.0@sha256:3d3a63a1f5597ac76dec5e63c627612a3c22fd9bcb0c67c77932a50bea6c8669,3400 pantry-tree: - sha256: c4a8dcfa5f5bc3bd77cfe86d904e96f90607adc1e4f3f1cf082e722673ee7230 - size: 1302 + sha256: a2ffe666e22257ca7cc47bc499fd687f0a9b608b8f3baf67ef2a800fb523fd4b + size: 1367 original: - hackage: fast-logger-3.2.3 + hackage: bytebuild-0.3.15.0 - completed: - hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605 + hackage: bytehash-0.1.1.1@sha256:995c95eebe86224e444dfe99e12446871a6ca58b960380e6dd4b4e12c9c7a141,2118 pantry-tree: - sha256: 0b2a3a57be48fcc739708b214fca202f1e95b1cd773dd3bb9589d3007cf8cf5e - size: 611 + sha256: 92ab802956b39e456517ef5f02df582831f1b31ec7d330d7db549ec3c5e88e00 + size: 587 original: - hackage: monad-validate-1.3.0.0 + hackage: bytehash-0.1.1.1 - completed: - hackage: hs-opentelemetry-api-0.1.0.0@sha256:8af01d0c81dd1af6d3293b105178fd9bfa0057c9eb88ac24d3c440bff660abe3,3705 + hackage: byteslice-0.2.13.0@sha256:3b6a9bf3adabd157fdd296f0613357313181ba7724aee12698115f3b5b62cd37,2627 pantry-tree: - sha256: 7c332e7241636097fe199bd87f57db333830bed416296e7ebf944497557f46be - size: 3221 + sha256: b2fadff364701d3dcff05a02a08bdb3d435c6bfedde7b5aedaf37ac33f4bf8f0 + size: 1841 original: - hackage: hs-opentelemetry-api-0.1.0.0 + hackage: byteslice-0.2.13.0 - completed: - hackage: hs-opentelemetry-exporter-otlp-0.0.1.5@sha256:89b0a6481096a338fa6383fbdf08ccaa0eb7bb009c4cbb340894eac33e55c5de,2214 + hackage: bytestring-0.11.5.3@sha256:3eee5d3658b657371d0f940f1f38feefc2ebdf8592a32d3d0734f28c61f80ba0,7595 pantry-tree: - sha256: 744146043f5818ad2b7577a32862affcbf6ed400b097723eae9f6941d739365e - size: 400 + sha256: bb97a05a67b1ea6c61af66e5abbbb0094bc397c1a930348442a41619026191ee + size: 4019 original: - hackage: hs-opentelemetry-exporter-otlp-0.0.1.5 + hackage: bytestring-0.11.5.3 - completed: - hackage: hs-opentelemetry-instrumentation-persistent-0.1.0.0@sha256:920e078b1bc141527a10c547e887ddb8d6295b216c49c8d1fe94f243d832eff9,1824 + hackage: Cabal-3.10.3.0@sha256:4a36954a66769eef90353daa0dbb07d43e49c228281383c7e4134445d495f714,12313 pantry-tree: - sha256: 27f0fef99e1c6b58d7fa4a5a3119df612c7ac0687723dbd5cc200747c9fe1829 - size: 426 + sha256: 1d8835f47d5a86a326a4997ce77f7bfd78d732a483264deaf0c280e8d2b764b7 + size: 9222 original: - hackage: hs-opentelemetry-instrumentation-persistent-0.1.0.0 + hackage: Cabal-3.10.3.0 - completed: - hackage: hs-opentelemetry-instrumentation-wai-0.1.0.0@sha256:6019cf031b3edec6ff0ace0df4c2e41358b9e5d939e6c326e4e1df50726348ee,1852 + hackage: Cabal-syntax-3.10.3.0@sha256:c2ca36499bf9365726968b1e11a757e6d846c47cdf0c2c26a003698fd3c300fe,7431 pantry-tree: - sha256: affe8d2c4c55181c84fc74abef68fde5c11a99581fd29a97e6a8a9fd1e016a43 - size: 411 + sha256: ac04439a8a9da0ad2ead90ebeaf5c27f133018954c70a4933b677a3f2aca538c + size: 11052 original: - hackage: hs-opentelemetry-instrumentation-wai-0.1.0.0 + hackage: Cabal-syntax-3.10.3.0 - completed: - hackage: hs-opentelemetry-otlp-0.0.1.0@sha256:88bb6b68f172a336f78018b0823f47363fb7408eb19f7301489f81ad4d5c0f33,2307 + hackage: containers-0.7@sha256:e9b5fdcc609159410d408c47e0be13663bb0b4a42a5183b52aa0ac9c99e1dfec,2668 pantry-tree: - sha256: e56292fc693805babed3c7ba7fc54e59d2e9adbc38de6bcc659009e8b10b9a1b - size: 2252 + sha256: 265b0a6110df990b5f9f04d21856333ed5ed66f37a4b0a0215901d831f69629b + size: 2954 original: - hackage: hs-opentelemetry-otlp-0.0.1.0 + hackage: containers-0.7 - completed: - hackage: hs-opentelemetry-propagator-b3-0.0.1.1@sha256:f0e9da77a888b89f81e5f5186788d5ace2a665e8914f6b446712a1c2edf17743,1854 + hackage: contiguous-0.6.4.0@sha256:30d28d17b3ca2a9eecb753f6e38f7bc0d0a4d3afd6d76ca79931b9c167b68c39,1861 pantry-tree: - sha256: 7ed0b0433837946d86f2ab364ef284dfc17fdcef9b4ea5fc48577a9441deeade - size: 482 + sha256: 0faeb61ebbb6c88bafa706fd15fa93cd70070924929673b2bdd89b1e4d49f7a6 + size: 600 original: - hackage: hs-opentelemetry-propagator-b3-0.0.1.1 + hackage: contiguous-0.6.4.0 - completed: - hackage: hs-opentelemetry-propagator-w3c-0.0.1.3@sha256:5dc2dbdd6b0a4e434ca5fd949e9ebe5611a5d513ef58009b935e9e810cc85d1b,1852 + hackage: country-0.2.4.1@sha256:db91ee099549626aab89fb3c082c272a0488d05a3b4e8a6ea335f15908537a35,3388 pantry-tree: - sha256: 84a8e40facf8df13084682a6e4852d940acc9d9abeaf2d716dbc9415258f4cc5 - size: 496 + sha256: 59fa6ff92aec88b3eba964e34a14d8d3493141503441138434383474f628853f + size: 1396 original: - hackage: hs-opentelemetry-propagator-w3c-0.0.1.3 + hackage: country-0.2.4.1 - completed: - hackage: hs-opentelemetry-sdk-0.0.3.6@sha256:6776705a4e0c06c6a4bfa16a9bed3ba353901f52d214ac737f57ea7f8e1ed465,3746 + hackage: datadog-0.3.0.0@sha256:c36a0e2d7b1f1c24b0b405df8b0bf3a17f6512f1da02f8c444fbb64944b0114b,3439 pantry-tree: - sha256: 154663d933a44c350db6c98d2c14db192c14fd04a10c17d0ebb8090707bd359b - size: 1430 + sha256: 6c3d2da0a57d62f41a753cb3e973162e1a62e7554c28cc5fc18ff85b252583f1 + size: 1488 original: - hackage: hs-opentelemetry-sdk-0.0.3.6 + hackage: datadog-0.3.0.0 - completed: - hackage: thread-utils-context-0.3.0.4@sha256:e763da1c6cab3b6d378fb670ca74aa9bf03c9b61b6fcf7628c56363fb0e3e71e,1671 + hackage: deepseq-1.4.8.1@sha256:79362747f088481e90c6dd09b5d7a90d52c4e12e72ffe66efaa23b2fba8b8991,2298 pantry-tree: - sha256: 57d909a991b5e0b4c7a28121cb52ee9c2db6c09e0419b89af6c82fae52be88d4 - size: 397 + sha256: 22697256b87675c82610ad3391a373ab7e9751134f387db94c03fbccc726a8f8 + size: 385 original: - hackage: thread-utils-context-0.3.0.4 + hackage: deepseq-1.4.8.1 - completed: - hackage: thread-utils-finalizers-0.1.1.0@sha256:24944b71d9f1d01695a5908b4a3b44838fab870883114a323336d537995e0a5b,1381 + hackage: doctest-0.22.10@sha256:8eba1e82737efd7598bf7f6cc47f5e0fe9b1217fd0afeeff31fc18430c449f28,8516 pantry-tree: - sha256: 8c2c2e2e22c20bf3696ee6f30b50b3a9eeae187a22beb536441eefb0a3f9c549 - size: 400 + sha256: 0746eb65b0cee70ecedbe184bb7f23531ff91eb5a4b74d3d09cfb3389ff980bf + size: 8961 original: - hackage: thread-utils-finalizers-0.1.1.0 + hackage: doctest-0.22.10 - completed: - hackage: Cabal-3.10.2.1@sha256:0f7cc73c7c0c18464ce249c97267a5188d796690a926d73b6e084a4612a66e32,12693 + hackage: directory-1.3.9.0@sha256:2490137bb7738bd79392959458ef5f276219ea5ba8a9a56d3e0b06315c1bb917,3307 pantry-tree: - sha256: 1b310294470d20ce457d90738b33dcf4fa952cf5d5f7df60cd1e47ea8a5dccba - size: 9224 + sha256: cf35b0c2755674f913078c588c88fc169d928ce09f292c648af9f1dbc3167131 + size: 3386 original: - hackage: Cabal-3.10.2.1 + hackage: directory-1.3.9.0 - completed: - hackage: Cabal-syntax-3.10.2.0@sha256:b2235bd61763a826259805a34ba3538888fe06850fc6bc1712e625baedf07c16,7675 + hackage: ekg-core-0.1.1.8@sha256:38b814ac8545a0096509b6e03e62f0f65ce5c97084c0b9c2459b5062c646e2fd,2052 pantry-tree: - sha256: 2130300bf88bad99a883a5f0fdc07f7c8bdb93e5e3ac2f25255b9b8d32b23f9c - size: 11052 + sha256: 5a560697719ee5912317b9ee96c80e708fee2e216aca4b012dbf58a34a71a920 + size: 1073 original: - hackage: Cabal-syntax-3.10.2.0 + hackage: ekg-core-0.1.1.8 - completed: - hackage: binary-0.8.9.1@sha256:81f468c1c75fd6535152ab69b2d32ac6cfcc03e345267b069abe4da56ec95801,6523 + hackage: fast-logger-3.2.3@sha256:41b4f1c07d5ee4a7cc785689eb7772554d29ddbbcced3cc184fe50fc63ece3f7,2176 pantry-tree: - sha256: 956ecd662408f69615977b87a92e042abcdc447b7824b8aabf5788c4393c10c5 - size: 1976 + sha256: c4a8dcfa5f5bc3bd77cfe86d904e96f90607adc1e4f3f1cf082e722673ee7230 + size: 1302 original: - hackage: binary-0.8.9.1 + hackage: fast-logger-3.2.3 - completed: - hackage: buffer-builder-0.2.4.8@sha256:37d8a5c384aa54d01d78dc18277a936ffcfd4194bad15d20b42fb2dc98fb89b7,5223 + hackage: filepath-1.4.301.0@sha256:02ca59b1c88ef5640db00b38aff713403c1b3481475b529a6fcc4c9f70a293ee,5900 pantry-tree: - sha256: 95c337267de6ca12d5ed8c52b275198df6d7afb30c913d81bfe4169f8dbf2b9a - size: 1155 + sha256: a309890379777206c55f4767f9dd36b5af68f6c54a9be8b2b7b9d34c7088e4e4 + size: 3998 original: - hackage: buffer-builder-0.2.4.8 + hackage: filepath-1.4.301.0 - completed: - hackage: bytebuild-0.3.15.0@sha256:3d3a63a1f5597ac76dec5e63c627612a3c22fd9bcb0c67c77932a50bea6c8669,3400 + hackage: hs-opentelemetry-api-0.1.0.0@sha256:8af01d0c81dd1af6d3293b105178fd9bfa0057c9eb88ac24d3c440bff660abe3,3705 pantry-tree: - sha256: a2ffe666e22257ca7cc47bc499fd687f0a9b608b8f3baf67ef2a800fb523fd4b - size: 1367 + sha256: 7c332e7241636097fe199bd87f57db333830bed416296e7ebf944497557f46be + size: 3221 original: - hackage: bytebuild-0.3.15.0 + hackage: hs-opentelemetry-api-0.1.0.0 - completed: - hackage: bytehash-0.1.1.1@sha256:995c95eebe86224e444dfe99e12446871a6ca58b960380e6dd4b4e12c9c7a141,2118 + hackage: hs-opentelemetry-exporter-otlp-0.0.1.5@sha256:89b0a6481096a338fa6383fbdf08ccaa0eb7bb009c4cbb340894eac33e55c5de,2214 pantry-tree: - sha256: 92ab802956b39e456517ef5f02df582831f1b31ec7d330d7db549ec3c5e88e00 - size: 587 + sha256: 744146043f5818ad2b7577a32862affcbf6ed400b097723eae9f6941d739365e + size: 400 original: - hackage: bytehash-0.1.1.1 + hackage: hs-opentelemetry-exporter-otlp-0.0.1.5 - completed: - hackage: byteslice-0.2.13.0@sha256:3b6a9bf3adabd157fdd296f0613357313181ba7724aee12698115f3b5b62cd37,2627 + hackage: hs-opentelemetry-instrumentation-persistent-0.1.0.0@sha256:920e078b1bc141527a10c547e887ddb8d6295b216c49c8d1fe94f243d832eff9,1824 pantry-tree: - sha256: b2fadff364701d3dcff05a02a08bdb3d435c6bfedde7b5aedaf37ac33f4bf8f0 - size: 1841 + sha256: 27f0fef99e1c6b58d7fa4a5a3119df612c7ac0687723dbd5cc200747c9fe1829 + size: 426 original: - hackage: byteslice-0.2.13.0 + hackage: hs-opentelemetry-instrumentation-persistent-0.1.0.0 - completed: - hackage: bytestring-0.11.5.3@sha256:3eee5d3658b657371d0f940f1f38feefc2ebdf8592a32d3d0734f28c61f80ba0,7595 + hackage: hs-opentelemetry-instrumentation-wai-0.1.0.0@sha256:6019cf031b3edec6ff0ace0df4c2e41358b9e5d939e6c326e4e1df50726348ee,1852 pantry-tree: - sha256: bb97a05a67b1ea6c61af66e5abbbb0094bc397c1a930348442a41619026191ee - size: 4019 + sha256: affe8d2c4c55181c84fc74abef68fde5c11a99581fd29a97e6a8a9fd1e016a43 + size: 411 original: - hackage: bytestring-0.11.5.3 + hackage: hs-opentelemetry-instrumentation-wai-0.1.0.0 - completed: - hackage: contiguous-0.6.4.0@sha256:30d28d17b3ca2a9eecb753f6e38f7bc0d0a4d3afd6d76ca79931b9c167b68c39,1861 + hackage: hs-opentelemetry-otlp-0.0.1.0@sha256:88bb6b68f172a336f78018b0823f47363fb7408eb19f7301489f81ad4d5c0f33,2307 pantry-tree: - sha256: 0faeb61ebbb6c88bafa706fd15fa93cd70070924929673b2bdd89b1e4d49f7a6 - size: 600 + sha256: e56292fc693805babed3c7ba7fc54e59d2e9adbc38de6bcc659009e8b10b9a1b + size: 2252 original: - hackage: contiguous-0.6.4.0 + hackage: hs-opentelemetry-otlp-0.0.1.0 - completed: - hackage: country-0.2.4.1@sha256:db91ee099549626aab89fb3c082c272a0488d05a3b4e8a6ea335f15908537a35,3388 + hackage: hs-opentelemetry-propagator-b3-0.0.1.1@sha256:f0e9da77a888b89f81e5f5186788d5ace2a665e8914f6b446712a1c2edf17743,1854 pantry-tree: - sha256: 59fa6ff92aec88b3eba964e34a14d8d3493141503441138434383474f628853f - size: 1396 + sha256: 7ed0b0433837946d86f2ab364ef284dfc17fdcef9b4ea5fc48577a9441deeade + size: 482 original: - hackage: country-0.2.4.1 + hackage: hs-opentelemetry-propagator-b3-0.0.1.1 - completed: - hackage: datadog-0.3.0.0@sha256:c36a0e2d7b1f1c24b0b405df8b0bf3a17f6512f1da02f8c444fbb64944b0114b,3439 + hackage: hs-opentelemetry-propagator-w3c-0.0.1.3@sha256:5dc2dbdd6b0a4e434ca5fd949e9ebe5611a5d513ef58009b935e9e810cc85d1b,1852 pantry-tree: - sha256: 6c3d2da0a57d62f41a753cb3e973162e1a62e7554c28cc5fc18ff85b252583f1 - size: 1488 + sha256: 84a8e40facf8df13084682a6e4852d940acc9d9abeaf2d716dbc9415258f4cc5 + size: 496 original: - hackage: datadog-0.3.0.0 + hackage: hs-opentelemetry-propagator-w3c-0.0.1.3 - completed: - hackage: deepseq-1.4.8.1@sha256:79362747f088481e90c6dd09b5d7a90d52c4e12e72ffe66efaa23b2fba8b8991,2298 + hackage: hs-opentelemetry-sdk-0.0.3.6@sha256:6776705a4e0c06c6a4bfa16a9bed3ba353901f52d214ac737f57ea7f8e1ed465,3746 pantry-tree: - sha256: 22697256b87675c82610ad3391a373ab7e9751134f387db94c03fbccc726a8f8 - size: 385 + sha256: 154663d933a44c350db6c98d2c14db192c14fd04a10c17d0ebb8090707bd359b + size: 1430 original: - hackage: deepseq-1.4.8.1 + hackage: hs-opentelemetry-sdk-0.0.3.6 - completed: - hackage: ekg-core-0.1.1.7@sha256:b2fd7793a446b306bbaafd1bb54b8b5b71f8f638879537baa24e86c60c83b9fc,2046 + hackage: monad-validate-1.3.0.0@sha256:eb6ddd5c9cf72ff0563cba604fa00291376e96138fdb4932d00ff3a99d66706e,2605 pantry-tree: - sha256: 0335c24c821d2c68599810492d514726c812df061eade51eb354ff81e3d7f544 - size: 1073 + sha256: 0b2a3a57be48fcc739708b214fca202f1e95b1cd773dd3bb9589d3007cf8cf5e + size: 611 original: - hackage: ekg-core-0.1.1.7 + hackage: monad-validate-1.3.0.0 - completed: - hackage: parsec-3.1.17.0@sha256:6cf18e59d9f1c5b40385457b82ab679dc18d3c5bd3c2c67b2f94e1e8732e6624,5119 + hackage: parsec-3.1.17.0@sha256:8407cbd428d7f640a0fff8891bd2f7aca13cebe70a5e654856f8abec9a648b56,5149 pantry-tree: - sha256: cca87377fcfe25583e1f7aadc4971111a86c2e66002dffa304be92f294db32c8 + sha256: 0922d72bd7115bbb590757bd92a827021dfe745ed6c0cd22856f767bee83d91f size: 2810 original: hackage: parsec-3.1.17.0 @@ -215,61 +229,40 @@ packages: original: hackage: pretty-1.1.3.6 - completed: - hackage: primitive-0.9.0.0@sha256:1ceb39f67c0e614180f2992a6d30f26603ab2cd23c4f8e25b30213f98807f6f1,3141 + hackage: time-compat-1.9.7@sha256:f0bff15af6faaeff36b679e6b810fa71534b2f85a91bf98d7541dac6a469b20f,4486 pantry-tree: - sha256: ebf0e03c7ca2f607d30cceeda49dc1f82a652177131f8922ac37846603421246 - size: 1793 + sha256: 0b3cf3a315e83eeca3f54a6f24e86d0655950aebd35779d8fbf1b4e81637a7a5 + size: 4111 original: - hackage: primitive-0.9.0.0 + hackage: time-compat-1.9.7 - completed: - hackage: primitive-unlifted-2.1.0.0@sha256:ef1113c8796391ef098a026f16dc827abd32a15cb847acdf2d83af9eba103299,2416 + hackage: process-1.6.25.0@sha256:9a0b2ef8096517fa0e0c7a5e9a5c2ae5744ed824c3331005f9408245810df345,2640 pantry-tree: - sha256: 149a906c65c89f1a8fa73819f44d1b31a19b510525fcea8afb5114c67d7c2cd5 - size: 1796 + sha256: 9c7927cd4d7f2f4c64251256eb6904800b3922fa5c5424c60f0e08441693e12b + size: 1790 original: - hackage: primitive-unlifted-2.1.0.0 + hackage: process-1.6.25.0 - completed: - hackage: process-1.6.18.0@sha256:69fbbca4151e1a6d1a5da41a1e17c254871675a4f2aed5213bbdfb10b5e52742,3148 + hackage: text-2.0.2@sha256:71b5fa8c64d3c1fd0a08f993463220867b08290a2256e94b0952bf0e8f5a45cc,9905 pantry-tree: - sha256: cd0bf20226dad3e1a1cfee36d38c3f74e851c3d1418d41d8cd3fb656d4f16634 - size: 1675 + sha256: 25f3b6dd211e30f9e0ef5047bb9f30df7a9296cf1043873e31558196dfe78676 + size: 7514 original: - hackage: process-1.6.18.0 + hackage: text-2.0.2 - completed: - hackage: proto-lens-0.7.1.4@sha256:3cff2d971ea53d5bbca2de411fa1617f27debaeb423bce0ea62947b8ff84499d,2973 - pantry-tree: - sha256: 130eb6387d34d59571e87e0e15921a62cb2004e067f39d08762f2e5e00d0d3dd - size: 1857 - original: - hackage: proto-lens-0.7.1.4 -- completed: - hackage: proto-lens-runtime-0.7.0.5@sha256:97a552648d3ca064a3e8a147244ffc589ccd30bd845f13e88271654924534b28,3051 - pantry-tree: - sha256: 1878611e1ee6bbfc2cef56701e1a085bc7e8d27ca4e8fe36326c1ab2bf26bbae - size: 168 - original: - hackage: proto-lens-runtime-0.7.0.5 -- completed: - hackage: run-st-0.1.3.2@sha256:c5dad13132d69294ea3bec3418a0f5593ede6fb5b071f463316d09e118fdbc38,870 - pantry-tree: - sha256: c5c0fafc3d62ab04abb5b3ee146937a9f8ade2a0bd12ce9b7a29172c50ab851b - size: 269 - original: - hackage: run-st-0.1.3.2 -- completed: - hackage: time-1.12.2@sha256:88e8493d9130038d3b9968a2530a0900141cd3d938483c83dde56e12b875ebc8,6510 + hackage: thread-utils-context-0.3.0.4@sha256:e763da1c6cab3b6d378fb670ca74aa9bf03c9b61b6fcf7628c56363fb0e3e71e,1671 pantry-tree: - sha256: de0ab314661da3788b5dad20254e44929b1659b00d32b5a0cd54922a05e006e8 - size: 7264 + sha256: 57d909a991b5e0b4c7a28121cb52ee9c2db6c09e0419b89af6c82fae52be88d4 + size: 397 original: - hackage: time-1.12.2 + hackage: thread-utils-context-0.3.0.4 - completed: - hackage: text-2.0@sha256:86e64bc76fefb8f0f6529d28ddf24b2a29d43591a8b9b7c7094f481a0db2fb7d,7788 + hackage: thread-utils-finalizers-0.1.1.0@sha256:24944b71d9f1d01695a5908b4a3b44838fab870883114a323336d537995e0a5b,1381 pantry-tree: - sha256: 894b84358fbad3cb8c16f224d3d8b7a1d7b6bcae68cda5a9998dd964904a6560 - size: 7364 + sha256: 8c2c2e2e22c20bf3696ee6f30b50b3a9eeae187a22beb536441eefb0a3f9c549 + size: 400 original: - hackage: text-2.0 + hackage: thread-utils-finalizers-0.1.1.0 - completed: hackage: unix-2.8.4.0@sha256:3532cdc3569087e33c193062498df3c0da1022cc997b1815b6a8a0ea5deb45eb,9351 pantry-tree: @@ -278,29 +271,29 @@ packages: original: hackage: unix-2.8.4.0 - completed: - hackage: containers-0.6.8@sha256:bb2bec1bbc6b39a7c97cd95e056a5698ec45beb5d8feb6caae12af64e4bd823c,2670 + hackage: yaml-0.11.11.2@sha256:6f0a1859e0fb3068e50dbc7fe9bf9a26847741bc24344e35e16a03711a18f88d,5178 pantry-tree: - sha256: 62d0b7f21a9f298867bbf0acae201d1fe4e32d309b4085a52c037eb551852811 - size: 2954 + sha256: 799f6815fe2c823561c3935bdf0cabe5f4f4a55462dc9c0d2a9838f963c97ea0 + size: 2044 original: - hackage: containers-0.6.8 + hackage: yaml-0.11.11.2 - completed: - hackage: directory-1.3.8.1@sha256:bd3b0a0947a365d2da80b9f4a960a864d42ffa7a46577fdc7a0611703486a7f9,3071 + hackage: yesod-core-1.6.26.0@sha256:dda0218a99e69987db0db88ec7eb58dab1253c377c1cddef7d4c1c593ce32c23,8443 pantry-tree: - sha256: f60c4c14a20e88daae7c6fba4421245ca254a1c048302ba2197e3622a808d343 - size: 3519 + sha256: 4ef96b72964ccfbbb2caa68f02f513fd41f98d4d836357fa358716c844b97efa + size: 5737 original: - hackage: directory-1.3.8.1 + hackage: yesod-core-1.6.26.0 - completed: - hackage: filepath-1.4.200.1@sha256:f4391ffdf2b43b1e775a401fd67ae2da1465b2b8820346a2683bec93092598ec,5900 + hackage: time-1.12.2@sha256:88e8493d9130038d3b9968a2530a0900141cd3d938483c83dde56e12b875ebc8,6510 pantry-tree: - sha256: 1b8cc89ffa122a9deb205b1b3939016b1d8aaa112504ad569a1d0c29b39d1000 - size: 3998 + sha256: de0ab314661da3788b5dad20254e44929b1659b00d32b5a0cd54922a05e006e8 + size: 7264 original: - hackage: filepath-1.4.200.1 + hackage: time-1.12.2 snapshots: - completed: - sha256: 027e1c40fdbeed68a4779a099ff8307c3054cd6ba61012305ea11b916bb41790 - size: 663135 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/9/19.yaml - original: nightly-2024-09-19 + sha256: 1435a8c3c419d01af402eef9c0938adb601031d8ed625622ef1519fa726db042 + size: 665058 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2024/10/11.yaml + original: nightly-2024-10-11 From 64b6df572d7944fd39289b9b2542d94dd892cfb0 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 21 Nov 2024 11:24:04 -0700 Subject: [PATCH 3/4] set category --- persistent-sql-lifted/package.yaml | 2 +- persistent-sql-lifted/persistent-sql-lifted.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/persistent-sql-lifted/package.yaml b/persistent-sql-lifted/package.yaml index b034e68..ca36a19 100644 --- a/persistent-sql-lifted/package.yaml +++ b/persistent-sql-lifted/package.yaml @@ -2,7 +2,7 @@ name: persistent-sql-lifted version: 1.20.3.0 maintainer: Freckle Education -category: Utils +category: Database github: freckle/freckle-app synopsis: ... description: Please see README.md diff --git a/persistent-sql-lifted/persistent-sql-lifted.cabal b/persistent-sql-lifted/persistent-sql-lifted.cabal index 33ebdfe..3c2de3f 100644 --- a/persistent-sql-lifted/persistent-sql-lifted.cabal +++ b/persistent-sql-lifted/persistent-sql-lifted.cabal @@ -8,7 +8,7 @@ name: persistent-sql-lifted version: 1.20.3.0 synopsis: ... description: Please see README.md -category: Utils +category: Database homepage: https://github.com/freckle/freckle-app#readme bug-reports: https://github.com/freckle/freckle-app/issues maintainer: Freckle Education From cefbc02b5916df5d7b7805daa7d15ef72ca61234 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Thu, 21 Nov 2024 11:25:28 -0700 Subject: [PATCH 4/4] typo --- freckle-app/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freckle-app/CHANGELOG.md b/freckle-app/CHANGELOG.md index a2e102f..b467aa0 100644 --- a/freckle-app/CHANGELOG.md +++ b/freckle-app/CHANGELOG.md @@ -1,6 +1,6 @@ ## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.21.0.0...main) -## [v1.21.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-vv1.20.3.0...freckle-app-v1.21.0.0) +## [v1.21.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.3.0...freckle-app-v1.21.0.0) The following have moved from `Freckle.App.Database` to a new package, `persistent-sql-lifted`: