From becf471f5c0109251fbef1d7b10081c545c99e6f Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 14 Jul 2026 11:43:15 -0600 Subject: [PATCH] Fill in some annoying gaps --- flake.lock | 68 +++++-------------- flake.nix | 4 +- persistent-sql-lifted/CHANGELOG.md | 13 +++- .../library/Database/Persist/Sql/Lifted.hs | 1 + .../Database/Persist/Sql/Lifted/Expression.hs | 8 ++- persistent-sql-lifted/package.yaml | 2 +- .../persistent-sql-lifted.cabal | 4 +- stack-lts24.yaml | 2 +- stack-nightly.yaml | 2 +- 9 files changed, 44 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 01e76a2..6d1942d 100644 --- a/flake.lock +++ b/flake.lock @@ -75,22 +75,20 @@ "flake-utils": "flake-utils_2", "haskell-openapi-code-generator": "haskell-openapi-code-generator", "nix-github-actions": "nix-github-actions", - "nixpkgs-22-11": "nixpkgs-22-11", "nixpkgs-23-05": "nixpkgs-23-05", "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-24-05": "nixpkgs-24-05", "nixpkgs-24-11": "nixpkgs-24-11", "nixpkgs-25-05": "nixpkgs-25-05", - "nixpkgs-haskell-updates": "nixpkgs-haskell-updates", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-unstable": "nixpkgs-unstable" }, "locked": { "dir": "main", - "lastModified": 1753720020, - "narHash": "sha256-rwF8u2K2jMt9dkepwqly1H6TMtoVmgGNn+eUHO+WFac=", + "lastModified": 1779890948, + "narHash": "sha256-ctF/BZJOuRpRtDRFCjewoE5hA7QS1WJDpK7fW1+FGr4=", "owner": "freckle", "repo": "flakes", - "rev": "1792ae7d0b83d1207f098350a520d4c7f9a00b84", + "rev": "3aa6d73d34ec7f30338263b3693fea1901a82253", "type": "github" }, "original": { @@ -147,7 +145,7 @@ "inputs": { "nixpkgs": [ "freckle", - "nixpkgs-stable" + "nixpkgs-25-05" ] }, "locked": { @@ -180,22 +178,6 @@ "type": "github" } }, - "nixpkgs-22-11": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-23-05": { "locked": { "lastModified": 1704290814, @@ -262,11 +244,11 @@ }, "nixpkgs-25-05": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -276,34 +258,18 @@ "type": "github" } }, - "nixpkgs-haskell-updates": { - "locked": { - "lastModified": 1752106956, - "narHash": "sha256-EpMssybIoC/je1g6Hzul9WiocLASBcRIpBg5Akyfdtg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "85ef96a2e6a71619f0b243cba615d04dbba6c8d0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "haskell-updates", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1736200483, - "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "lastModified": 1759036355, + "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -326,16 +292,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753489912, - "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", + "lastModified": 1784011430, + "narHash": "sha256-lDebytrYdd47IBLwvNOD+6AGeoqZ78CIKlp70hzW280=", "owner": "nixos", "repo": "nixpkgs", - "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", + "rev": "8eeec934ae0dbeca3d7868c059568a65c08b2fc3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index b0904a6..398af19 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; freckle.url = "github:freckle/flakes?dir=main"; flake-utils.url = "github:numtide/flake-utils"; }; @@ -18,7 +18,7 @@ packages = { fourmolu = freckle.fourmolu-0-17-x; ghc = freckleLib.haskellBundle { - ghcVersion = "ghc-9-10-2"; + ghcVersion = "ghc-9-10-3"; enableHLS = true; }; }; diff --git a/persistent-sql-lifted/CHANGELOG.md b/persistent-sql-lifted/CHANGELOG.md index d592f63..220310d 100644 --- a/persistent-sql-lifted/CHANGELOG.md +++ b/persistent-sql-lifted/CHANGELOG.md @@ -1,4 +1,15 @@ -## [_Unreleased_](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.4.4.0...main) +## [_Unreleased_](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.4.5.0...main) + +## [v0.4.5.0](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.4.4.0...persistent-sql-lifted-v0.4.5.0) + +Add to `Database.Persist.Sql.Lifted`: + +- `Entity(..)` + +Add to `Database.Persist.Sql.Lifted.Expression`: + +- `Value(..)` +- `deriveEsqueletoRecord` ## [v0.4.4.0](https://github.com/freckle/persistent-sql-lifted/compare/persistent-sql-lifted-v0.4.3.1...persistent-sql-lifted-v0.4.4.0) diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs index 29bf080..87d6388 100644 --- a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs +++ b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted.hs @@ -20,6 +20,7 @@ module Database.Persist.Sql.Lifted , SqlBackend , MonadSqlBackend (..) , liftSql + , Entity (..) -- * Getting by key , get diff --git a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression.hs b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression.hs index f94dc73..d3352ae 100644 --- a/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression.hs +++ b/persistent-sql-lifted/library/Database/Persist/Sql/Lifted/Expression.hs @@ -1,7 +1,11 @@ module Database.Persist.Sql.Lifted.Expression - ( -- * Type + ( -- * Expression type SqlExpr + -- * Result types + , Value (..) + , deriveEsqueletoRecord + -- * Constant , val @@ -117,6 +121,8 @@ module Database.Persist.Sql.Lifted.Expression , (/=.) ) where +import Database.Esqueleto.Experimental (Value (..)) +import Database.Esqueleto.Record (deriveEsqueletoRecord) import Database.Persist.Sql.Lifted.Expression.Bool import Database.Persist.Sql.Lifted.Expression.Case import Database.Persist.Sql.Lifted.Expression.Comparison diff --git a/persistent-sql-lifted/package.yaml b/persistent-sql-lifted/package.yaml index f21a26a..6f23dbb 100644 --- a/persistent-sql-lifted/package.yaml +++ b/persistent-sql-lifted/package.yaml @@ -1,5 +1,5 @@ name: persistent-sql-lifted -version: 0.4.4.0 +version: 0.4.5.0 maintainer: Freckle Education category: Database diff --git a/persistent-sql-lifted/persistent-sql-lifted.cabal b/persistent-sql-lifted/persistent-sql-lifted.cabal index 58b67d9..a8a2b93 100644 --- a/persistent-sql-lifted/persistent-sql-lifted.cabal +++ b/persistent-sql-lifted/persistent-sql-lifted.cabal @@ -1,11 +1,11 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.38.0. +-- This file has been generated from package.yaml by hpack version 0.39.1. -- -- see: https://github.com/sol/hpack name: persistent-sql-lifted -version: 0.4.4.0 +version: 0.4.5.0 synopsis: Monad classes for running queries with Persistent and Esqueleto description: This package introduces two classes: MonadSqlBackend for monadic contexts in which a SqlBackend is available, and MonadSqlTx for contexts in which we diff --git a/stack-lts24.yaml b/stack-lts24.yaml index a8eb303..11b1770 100644 --- a/stack-lts24.yaml +++ b/stack-lts24.yaml @@ -1,4 +1,4 @@ -resolver: lts-24.2 +resolver: lts-24.50 packages: - persistent-sql-lifted diff --git a/stack-nightly.yaml b/stack-nightly.yaml index 142730f..2abde0c 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2025-01-06 +resolver: nightly-2026-06-06 packages: - persistent-sql-lifted