Implement support for Aeson-2.2.3

[tonyalaribe]

No description provided.

[tonyalaribe]

Yeah, exactly. I disabled this just so I could get the branch to compile. I will delete it from the PR now.

…

On Thu, Aug 1, 2024, 19:22 j6carey ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In stack.yaml <#252 (comment)> : > nix: packages: - zlib.dev - zlib.out + + +flags: + proto3-suite: + large-records: False + dhall: False To answer my own question: probably it's an issue with dhall and the GHC 9.8 compiler or dependencies. — Reply to this email directly, view it on GitHub <#252 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABSCVAUI2S2ODDBIQD5WTQLZPJVFRAVCNFSM6AAAAABL2A3ZF6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDEMJTGQZDIOJQGQ> . You are receiving this because you authored the thread.Message ID: ***@***.***>

[j6carey]

Yeah, exactly. I disabled this just so I could get the branch to compile. I will delete it from the PR now.

There's some hope that as the toolchain evolves we will be able to support dhall once again for GHC 9.8.

[j6carey]

@tonyalaribe , we are investigating the mysterious CI failure.

[riz0id]

What is attoparsec-aeson used for? If we absolutely must depend on attoparsec-aeson then can we have bounds added?

[j6carey]

@tonyalaribe , CI seems to be working again.

[riz0id]

Add bounds on the attoparsec-aeson package and we can merge this.

[tonyalaribe]

Add bounds on the attoparsec-aeson package and we can merge this.

Thanks! I've pushed an update with the bounds

[j6carey]

From the CI failures, my guess is that we will have to make the mention of attoparsec-aeson conditional.

[j6carey]

@tonyalaribe , could you merge branch "master" into your PR? There have been some recent changes to the Nix environment that might be relevant.

[tonyalaribe]

@tonyalaribe , could you merge branch "master" into your PR? There have been some recent changes to the Nix environment that might be relevant.

@j6carey The branch is up to date with master

[tonyalaribe]

I'm not so familiar with nix, so i'm having trouble debugging the issue with the CI

[j6carey]

@tonyalaribe , could you merge branch "master" into your PR? There have been some recent changes to the Nix environment that might be relevant.

@j6carey The branch is up to date with master

My mistake; when I checked for that I was looking at the wrong PR. Sorry for the confusion. I'll look into the build issues.

[j6carey]

@tonyalaribe , could you try the following changes to avoid the build failures for older package sets that lack attoparsec-aeson, and to start using the aeson version chosen by nixpkgs?:

git rm these files:

	deleted:    nix/packages/aeson.nix
	deleted:    nix/packages/attoparsec-aeson.nix
	deleted:    nix/patches/aeson-2.1.2.1.patch

Apply this patch:

diff --git a/nix/overlays/haskell-packages.nix b/nix/overlays/haskell-packages.nix
index 621b842..d33862a 100644
--- a/nix/overlays/haskell-packages.nix
+++ b/nix/overlays/haskell-packages.nix
@@ -34,9 +34,6 @@ in {
 
           # With nixpkgs-23.11 and ghc981, aeson-2.1.2.1 thinks that th-abstraction is out of bounds.
           #
-          # Also, in order to avoid the breaking change to package structure in aeson-2.2.0.0,
-          # we patch the import list of aeson-2.1.2.1.
-          #
           # And we disable tests because explicitly specifying aeson-2.1.2.1
           # seems to trigger a test failure, at least on GHC 9.4.8 and 9.8.1;
           # perhaps somewhere in nixpkgs the test is suppressed and
@@ -52,9 +49,7 @@ in {
           #
           aeson =
             pkgsNew.haskell.lib.doJailbreak
-              ( pkgsNew.haskell.lib.dontCheck
-                  ( pkgsNew.haskell.lib.appendPatches haskellPackagesOld.aeson
-                      [ ../patches/aeson-2.1.2.1.patch ] ) );
+              (pkgsNew.haskell.lib.dontCheck haskellPackagesOld.aeson);
 
           # With nixpkgs-23.11 and ghc981, atomic-write wants hspec for testing,
           # which causes problems.
diff --git a/proto3-suite.cabal b/proto3-suite.cabal
index 3e750c3..4a9651d 100644
--- a/proto3-suite.cabal
+++ b/proto3-suite.cabal
@@ -43,6 +43,12 @@ flag large-records
   Default:       True
   Manual:        True
 
+flag attoparsec-aeson
+  Description:   Depend upon the Haskell package "attoparsec-aeson".
+  Default:       True
+  Manual:        False
+    -- "Manual: False" to automatically skip "attoparsec-aeson" if it is not available
+
 source-repository head
   type:     git
   location: https://github.com/awakesecurity/proto3-suite
@@ -100,10 +106,9 @@ library
 
   other-modules:       Turtle.Compat
 
-  build-depends:       aeson >= 1.1.1.0 && < 2.2,
+  build-depends:       aeson >= 1.1.1.0,
                        aeson-pretty,
                        attoparsec >= 0.13.0.1,
-                       attoparsec-aeson >= 2.2.0.0 ,
                        base >=4.15 && <5.0,
                        base64-bytestring >= 1.0.0.1 && < 1.3,
                        binary >=0.8.3,
@@ -136,6 +141,8 @@ library
                        transformers >=0.4 && <0.7,
                        turtle < 1.6.0 || >= 1.6.1 && < 1.7.0,
                        vector >=0.11 &&  <0.14
+  if flag(attoparsec-aeson)
+    build-depends:     attoparsec-aeson >= 2.2.0.0
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -O2 -Wall -Werror
@@ -195,7 +202,6 @@ test-suite tests
   build-depends:
       aeson >= 1.1.1.0
     , attoparsec >= 0.13.0.1
-    , attoparsec-aeson
     , base >=4.15 && <5.0
     , base64-bytestring >= 1.0.0.1 && < 1.3
     , bytestring >=0.10.6.0 && <0.13
@@ -223,6 +229,8 @@ test-suite tests
     , transformers >=0.4 && <0.7
     , turtle
     , vector >=0.11 && < 0.14
+  if flag(attoparsec-aeson)
+    build-depends:     attoparsec-aeson
 
   ghc-options:         -O2 -Wall