Merge pull request #15 from composite-hs/df/8.2.2

Bump to 8.2.2
composite-hs · Dec 4, 2023 · e90f04c · e90f04c
2 parents 283cf87 + a433af2
commit e90f04c
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 50 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.8.2.2
+
+* Helpers to specialize JsonFields from `a` to `s :-> a`
+* Build modernization to haskell.nix
+* Add default JsonField behavior with `defaultField`
+
 ## 0.8.2.1
 
 * Bumped dependency on hashable

diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
-> :warning: **This project has moved to https://github.com/composite-hs.**
-
 ## composite
 
 [![Build status](https://github.com/composite-hs/composite/actions/workflows/workflow.yml/badge.svg)](https://github.com/composite-hs/composite/actions/workflows/workflow.yml)

diff --git a/composite-aeson-path/composite-aeson-path.cabal b/composite-aeson-path/composite-aeson-path.cabal
@@ -1,13 +1,7 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
---
--- see: https://github.com/sol/hpack
---
--- hash: 3a51b44deb384440cef77dc8bcbaafaf88b9c7360e1c3d798ed55c934cc4404f
-
 name:           composite-aeson-path
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       Formatting data for the path library.
 description:    JsonFormat for Path.
 category:       Records

diff --git a/composite-aeson-refined/composite-aeson-refined.cabal b/composite-aeson-refined/composite-aeson-refined.cabal
@@ -1,13 +1,7 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
---
--- see: https://github.com/sol/hpack
---
--- hash: 2c6376add06c5f1da296b2253dfd6fe429bfed6a9add56346fada2d5832cd938
-
 name:           composite-aeson-refined
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       composite-aeson support for Refined from the refined package
 description:    JsonFormat and DefaultJsonFormat for Refined
 category:       Records

diff --git a/composite-aeson/composite-aeson.cabal b/composite-aeson/composite-aeson.cabal
@@ -1,7 +1,7 @@
 cabal-version: 1.12
 
 name:           composite-aeson
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       JSON for Vinyl records
 description:    Integration between Aeson and Vinyl records allowing records to be easily converted to JSON using automatic derivation, explicit formats, or a mix of both.
 category:       Records

diff --git a/composite-binary/composite-binary.cabal b/composite-binary/composite-binary.cabal
@@ -1,13 +1,7 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
---
--- see: https://github.com/sol/hpack
---
--- hash: 2852a9dffb75a502e1c94c71a887e102192e2be9ae00f61929fab9165915e5c3
-
 name:           composite-binary
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       Orphan binary instances.
 description:    Binary instance for (:->) and Record.
 category:       Records

diff --git a/composite-ekg/composite-ekg.cabal b/composite-ekg/composite-ekg.cabal
@@ -1,13 +1,7 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
---
--- see: https://github.com/sol/hpack
---
--- hash: c5c143eb918a8d555e19489fecbbd3b4484636640c2c9949d8c185c533175b12
-
 name:           composite-ekg
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       EKG Metrics for Vinyl records
 description:    Integration between EKG and Vinyl records allowing records holding registered metrics to be easily constructed from a type declaration.
 category:       Records

diff --git a/composite-hashable/composite-hashable.cabal b/composite-hashable/composite-hashable.cabal
@@ -1,13 +1,7 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
---
--- see: https://github.com/sol/hpack
---
--- hash: 3abbd0c18db9d207737590cd0a0cc1fe93e664d7b45ac7c770a506479bc3b948
-
 name:           composite-hashable
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       Orphan hashable instances.
 description:    Hashable instance for (:->) and Record.
 category:       Records

diff --git a/composite-opaleye/composite-opaleye.cabal b/composite-opaleye/composite-opaleye.cabal
@@ -1,7 +1,7 @@
 cabal-version: 1.12
 
 name:           composite-opaleye
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       Opaleye SQL for Vinyl records
 description:    Integration between Vinyl records and Opaleye SQL, allowing records to be stored, retrieved, and queried from PostgreSQL.
 category:       Records

diff --git a/composite-swagger/composite-swagger.cabal b/composite-swagger/composite-swagger.cabal
@@ -1,13 +1,7 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.7.
---
--- see: https://github.com/sol/hpack
---
--- hash: e9323b991b2e9d2961f5fbad0ae1fe526109f7e6bbd459f6efd06d4bfc410d78
-
 name:           composite-swagger
-version:        0.8.2.1
+version:        0.8.2.2
 synopsis:       Swagger for Vinyl records
 description:    Integration between Swagger and Vinyl records allowing easily derivable/explicit Swagger definitions for records.
 category:       Records

diff --git a/default.nix b/default.nix
@@ -3,14 +3,14 @@
 
 with builtins;
 let
-  haskellNix = import (builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/2f3ec7bbf2e790122ca276a4ab038bf2749c6c93.tar.gz") {};
+  haskellNix = import (builtins.fetchTarball "https://github.com/input-output-hk/haskell.nix/archive/a9efc0ae3a607eaebc6e841ca3960134e9034077.tar.gz") {};
   pkgs = import nixpkgsSrc haskellNix.nixpkgsArgs;
   project = pkgs.haskell-nix.cabalProject {
-    name = "refurb";
+    name = "composite";
     src = ./.;
     cabalProject = readFile ./cabal.project;
     compiler-nix-name = "ghc925";
-    index-state = "2022-12-01T00:00:00Z";
+    index-state = "2023-12-01T00:00:00Z";
     modules = [
       {
         packages.postgresql-libpq = {
@@ -24,7 +24,7 @@ let
   };
   shell = project.shellFor {
     tools = {
-      cabal = "3.6.2.0";
+      cabal = "3.10.1.0";
     };
     nativeBuildInputs = [
       pkgs.pkg-config