Merge pull request #6750 from commercialhaskell/recurator52

Author: mpilgrem

CONTRIBUTING.md

@@ -350,7 +350,7 @@ depends at any time are specified by `package.yaml` and `stack.yaml`. It does
 not aim to be compatible with more than one version of the `Cabal` package at
 any time. At the time of writing (June 2025) the package versions are
 primarily ones in Stackage snapshot LTS Haskell 23.24 (for GHC 9.8.4) and
-`hpack-0.38.1` and `tls-2.1.8`.
+`hpack-0.38.1`, `persistent-2.17.0.0` and `tls-2.1.8`.
 
 A Stack executable makes use of Cabal (the library) through a small 'Setup'
 executable that it compiles from Haskell source code. The executable compiles

cabal.config

@@ -145,7 +145,7 @@ constraints:
   , path-io ==1.8.2
   , path-pieces ==0.2.1
   , pem ==0.2.4
-  , persistent ==2.14.6.3
+  , persistent ==2.17.0.0
   , persistent-sqlite ==2.13.3.0
   , persistent-template ==2.12.0.0
   , pretty ==1.1.3.6
@@ -155,6 +155,7 @@ constraints:
   , process ==1.6.25.0
   , project-template ==0.2.1.0
   , random ==1.2.1.3
+  , replace-megaparsec ==1.5.0.1
   , resource-pool ==0.4.0.0
   , resourcet ==1.3.0
   , retry ==0.9.3.1

package.yaml

@@ -105,7 +105,7 @@ dependencies:
 # In order for Cabal (the tool) to build Stack, it needs to be told of the
 # upper bound on persistent. See
 # https://github.com/commercialhaskell/stack/pull/5677#issuecomment-1193318542
-- persistent >= 2.14.0.0 && < 2.15
+- persistent >= 2.14.0.0 && < 2.18
 - persistent-sqlite
 - pretty
 - process >= 1.6.13.2

src/Stack/Storage/Project.hs

@@ -59,7 +59,7 @@ share [ mkPersist sqlSettings
       ]
       [persistLowerCase|
 ConfigCacheParent sql="config_cache"
-  directory FilePath "default=(hex(randomblob(16)))"
+  directory FilePath default="(hex(randomblob(16)))"
   type ConfigCacheType
   pkgSrc CachePkgSrc
   active Bool

src/Stack/Storage/User.hs

@@ -97,7 +97,7 @@ share [ mkPersist sqlSettings
       ]
       [persistLowerCase|
 PrecompiledCacheParent sql="precompiled_cache"
-  platformGhcDir FilePath "default=(hex(randomblob(16)))"
+  platformGhcDir FilePath default="(hex(randomblob(16)))"
   compiler Text
   cabalVersion Text
   packageKey Text

stack.cabal

@@ -456,7 +456,7 @@ library
     , pantry >=0.10.1
     , path >=0.9.5
     , path-io
-    , persistent >=2.14.0.0 && <2.15
+    , persistent >=2.14.0.0 && <2.18
     , persistent-sqlite
     , pretty
     , process >=1.6.13.2
@@ -579,7 +579,7 @@ executable stack
     , pantry >=0.10.1
     , path >=0.9.5
     , path-io
-    , persistent >=2.14.0.0 && <2.15
+    , persistent >=2.14.0.0 && <2.18
     , persistent-sqlite
     , pretty
     , process >=1.6.13.2
@@ -684,7 +684,7 @@ executable stack-integration-test
     , pantry >=0.10.1
     , path >=0.9.5
     , path-io
-    , persistent >=2.14.0.0 && <2.15
+    , persistent >=2.14.0.0 && <2.18
     , persistent-sqlite
     , pretty
     , process >=1.6.13.2
@@ -801,7 +801,7 @@ test-suite stack-unit-test
     , pantry >=0.10.1
     , path >=0.9.5
     , path-io
-    , persistent >=2.14.0.0 && <2.15
+    , persistent >=2.14.0.0 && <2.18
     , persistent-sqlite
     , pretty
     , process >=1.6.13.2

stack.yaml

@@ -3,6 +3,8 @@ snapshot: lts-23.24 # GHC 9.8.4
 extra-deps:
 # lts-23.24 provides hpack-0.37.0
 - hpack-0.38.1@rev:0
+# lts-23.24 provides persistent-2.14.6.3
+- persistent-2.17.0.0@rev:0
 # lts-23.24 provides tls-2.1.1
 - tls-2.1.8@rev:0
 

stack.yaml.lock

@@ -11,6 +11,13 @@ packages:
       size: 3798
   original:
     hackage: hpack-0.38.1@rev:0
+- completed:
+    hackage: persistent-2.17.0.0@sha256:0f7e9ffa26c2d3fc4b9529de4604ce3880b5ce6d95229372c3aae83ca2a0f0ea,7049
+    pantry-tree:
+      sha256: dbb4bb665db11ca940ddea74f455afdfeb827fd9a3cef663e15673a678e3917c
+      size: 7096
+  original:
+    hackage: persistent-2.17.0.0@rev:0
 - completed:
     hackage: tls-2.1.8@sha256:69b583c77cc25d8efd62fd48462f469a7c66db551013db753e4062e3b56576f9,6223
     pantry-tree: