update to stackage LTS 23 (ghc-9.8.4); purs package-set update

Author: jonschoning

changelog.md

@@ -1,3 +1,7 @@
+__v0.0.22__
+
+update to stackage LTS 23 (ghc-9.8.4); purs package-set update
+
 __v0.0.21__
 switch to esm javascript module imports
 

espial.cabal

@@ -1,17 +1,16 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           espial
-version:        0.0.21
+version:        0.0.22
 synopsis:       Espial is an open-source, web-based bookmarking server.
-description:    .
-                Espial is an open-source, web-based bookmarking server.
+description:     Espial is an open-source, web-based bookmarking server.
                 - Yesod + PureScript + sqlite3
                 - multi-user (w/ privacy scopes)
-                - tags, stars, editing, deleting 
+                - tags, stars, editing, deleting
 category:       Web
 homepage:       https://github.com/jonschoning/espial
 bug-reports:    https://github.com/jonschoning/espial/issues
@@ -160,10 +159,10 @@ library
       aeson >=1.4
     , attoparsec
     , base >=4.18.1.0 && <5
-    , base64 <1
+    , base64 ==1.*
     , bcrypt >=0.0.8
     , blaze-html >=0.9 && <1.0
-    , bytestring >=0.11.5 && <0.12
+    , bytestring >=0.11.5 && <0.13
     , case-insensitive
     , classy-prelude >=1.4 && <1.6
     , classy-prelude-conduit >=1.4 && <1.6
@@ -175,7 +174,7 @@ library
     , data-default
     , directory >=1.1 && <1.4
     , entropy
-    , esqueleto >=3.5.11.1 && <3.5.14
+    , esqueleto >=3.5.11.1 && <3.5.15
     , fast-logger >=2.2 && <4
     , file-embed
     , foreign-store
@@ -207,7 +206,7 @@ library
     , wai
     , wai-extra >=3.0 && <3.2
     , wai-logger
-    , warp >=3.0 && <3.4
+    , warp >=3.0 && <3.5
     , yaml >=0.8 && <0.12
     , yesod >=1.6 && <1.8
     , yesod-auth >=1.6 && <1.8
@@ -275,10 +274,10 @@ executable espial
       aeson >=1.4
     , attoparsec
     , base >=4.18.1.0 && <5
-    , base64 <1
+    , base64 ==1.*
     , bcrypt >=0.0.8
     , blaze-html >=0.9 && <1.0
-    , bytestring >=0.11.5 && <0.12
+    , bytestring >=0.11.5 && <0.13
     , case-insensitive
     , classy-prelude >=1.4 && <1.6
     , classy-prelude-conduit >=1.4 && <1.6
@@ -291,7 +290,7 @@ executable espial
     , directory >=1.1 && <1.4
     , entropy
     , espial
-    , esqueleto >=3.5.11.1 && <3.5.14
+    , esqueleto >=3.5.11.1 && <3.5.15
     , fast-logger >=2.2 && <4
     , file-embed
     , foreign-store
@@ -323,7 +322,7 @@ executable espial
     , wai
     , wai-extra >=3.0 && <3.2
     , wai-logger
-    , warp >=3.0 && <3.4
+    , warp >=3.0 && <3.5
     , yaml >=0.8 && <0.12
     , yesod >=1.6 && <1.8
     , yesod-auth >=1.6 && <1.8
@@ -387,10 +386,10 @@ executable migration
       aeson >=1.4
     , attoparsec
     , base >=4.18.1.0 && <5
-    , base64 <1
+    , base64 ==1.*
     , bcrypt >=0.0.8
     , blaze-html >=0.9 && <1.0
-    , bytestring >=0.11.5 && <0.12
+    , bytestring >=0.11.5 && <0.13
     , case-insensitive
     , classy-prelude >=1.4 && <1.6
     , classy-prelude-conduit >=1.4 && <1.6
@@ -403,7 +402,7 @@ executable migration
     , directory >=1.1 && <1.4
     , entropy
     , espial
-    , esqueleto >=3.5.11.1 && <3.5.14
+    , esqueleto >=3.5.11.1 && <3.5.15
     , fast-logger >=2.2 && <4
     , file-embed
     , foreign-store
@@ -437,7 +436,7 @@ executable migration
     , wai
     , wai-extra >=3.0 && <3.2
     , wai-logger
-    , warp >=3.0 && <3.4
+    , warp >=3.0 && <3.5
     , yaml >=0.8 && <0.12
     , yesod >=1.6 && <1.8
     , yesod-auth >=1.6 && <1.8
@@ -505,10 +504,10 @@ test-suite test
       aeson >=1.4
     , attoparsec
     , base >=4.18.1.0 && <5
-    , base64 <1
+    , base64 ==1.*
     , bcrypt >=0.0.8
     , blaze-html >=0.9 && <1.0
-    , bytestring >=0.11.5 && <0.12
+    , bytestring >=0.11.5 && <0.13
     , case-insensitive
     , classy-prelude >=1.4 && <1.6
     , classy-prelude-conduit >=1.4 && <1.6
@@ -521,7 +520,7 @@ test-suite test
     , directory >=1.1 && <1.4
     , entropy
     , espial
-    , esqueleto >=3.5.11.1 && <3.5.14
+    , esqueleto >=3.5.11.1 && <3.5.15
     , fast-logger >=2.2 && <4
     , file-embed
     , foreign-store
@@ -554,7 +553,7 @@ test-suite test
     , wai
     , wai-extra >=3.0 && <3.2
     , wai-logger
-    , warp >=3.0 && <3.4
+    , warp >=3.0 && <3.5
     , yaml >=0.8 && <0.12
     , yesod >=1.6 && <1.8
     , yesod-auth >=1.6 && <1.8

package.yaml

@@ -1,16 +1,14 @@
 name:    espial
 synopsis: Espial is an open-source, web-based bookmarking server.
-version: "0.0.21"
+version: "0.0.22"
 description: ! '
-
   Espial is an open-source, web-based bookmarking server.
 
   - Yesod + PureScript + sqlite3
 
   - multi-user (w/ privacy scopes)
   
-  - tags, stars, editing, deleting
-'
+  - tags, stars, editing, deleting'
 category: Web
 author: Jon Schoning
 maintainer: [email protected]
@@ -91,7 +89,7 @@ dependencies:
 - classy-prelude >=1.4 && <1.6
 - classy-prelude-conduit >=1.4 && <1.6
 - classy-prelude-yesod >=1.4 && <1.6
-- bytestring >=0.11.5 && <0.12
+- bytestring >=0.11.5 && <0.13
 - text >=2 && <3.0
 - persistent >=2.14 && <2.15
 - blaze-html >= 0.9 && < 1.0
@@ -104,7 +102,7 @@ dependencies:
 - http-client-tls >=0.3 && <0.4
 - http-conduit >=2.3 && <2.4
 - directory >=1.1 && <1.4
-- warp >=3.0 && <3.4
+- warp >=3.0 && <3.5
 - data-default
 - conduit >=1.0 && <2.0
 - monad-logger >=0.3 && <0.4
@@ -124,7 +122,7 @@ dependencies:
 - attoparsec
 - bcrypt >= 0.0.8
 - entropy
-- esqueleto >= 3.5.11.1 && < 3.5.14
+- esqueleto >= 3.5.11.1 && < 3.5.15
 - hscolour
 - http-api-data >= 0.3.4
 - http-client
@@ -138,7 +136,7 @@ dependencies:
 - parser-combinators
 - html-entities
 - crypton-connection
-- base64 < 1
+- base64 >=1 && < 2
 - cryptohash-sha256
 
 when: 

purs/packages.dhall

@@ -21,8 +21,8 @@ in  upstream
     }
 -}
 let upstream =
-      https://raw.githubusercontent.com/purescript/package-sets/psc-0.15.15-20240829/src/packages.dhall
-        sha256:5bab5469c75bd8c7bac517385e6dd66cca0b2651676b4a99b357753c80bbe673
+      https://raw.githubusercontent.com/purescript/package-sets/psc-0.15.15-20250513/src/packages.dhall
+        sha256:2a6cc3d39a5bf5d3a7416a68ea7ed8fb669180bc936fe06bc104b49799af0185
 
 in  upstream
   with simple-json =

src/Import/NoFoundation.hs

@@ -22,7 +22,7 @@ import Model as Import
 import ModelCustom as Import
 import Types as Import
 import Pretty as Import
-import Data.Functor as Import
+import Data.Functor as Import hiding (unzip)
 import Generic as Import
 import Database.Persist.Sql as Import (fromSqlKey, toSqlKey)
 

src/ModelCustom.hs

@@ -12,6 +12,7 @@ import qualified Data.Aeson as A
 import System.Entropy (getEntropy)
 import qualified Data.ByteString.Builder as BB
 import qualified Data.ByteString.Lazy as LBS
+import qualified Data.Base64.Types as Base64
 import qualified Data.ByteString.Base64.URL as Base64Url
 import qualified Crypto.Hash.SHA256 as SHA256
 
@@ -71,7 +72,7 @@ newtype HashedApiKey
 generateApiKey :: IO ApiKey
 generateApiKey = do
   bytes <- getEntropy 32
-  pure $ ApiKey $ Base64Url.encodeBase64 bytes
+  pure $ ApiKey $ Base64.extractBase64 $ Base64Url.encodeBase64 bytes
 
 hashApiKey :: ApiKey -> HashedApiKey
-hashApiKey = HashedApiKey . TE.decodeUtf8 . Base64Url.encodeBase64' . SHA256.hash . TE.encodeUtf8 . unApiKey
+hashApiKey = HashedApiKey . TE.decodeUtf8 . Base64.extractBase64 . Base64Url.encodeBase64' . SHA256.hash . TE.encodeUtf8 . unApiKey

stack.yaml

@@ -1,3 +1,3 @@
-resolver: lts-22.33
+resolver: lts-23.22
 packages:
 - .

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: 098936027eaa1ef14e2b8eb39d9933a973894bb70a68684a1bbf00730249879b
-    size: 720001
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/33.yaml
-  original: lts-22.33
+    sha256: f8c8f95e57e436cee7c053b6f424e2c07a1020304a5583f3568cd9521443c340
+    size: 683838
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/22.yaml
+  original: lts-23.22