File tree Expand file tree Collapse file tree 2 files changed +33
-2
lines changed Expand file tree Collapse file tree 2 files changed +33
-2
lines changed Original file line number Diff line number Diff line change
1
+ {
2
+ inputs . nixpkgs . url = github:NixOS/nixpkgs/nixos-unstable ;
3
+ inputs . flake-utils . url = github:poscat0x04/flake-utils ;
4
+
5
+ outputs = { self , nixpkgs , flake-utils , ... } : with flake-utils ;
6
+ eachDefaultSystem (
7
+ system :
8
+ let
9
+ pkgs = import nixpkgs { inherit system ; overlays = [ self . overlay ] ; } ;
10
+ in
11
+ with pkgs ;
12
+ {
13
+ devShell = aeson-dev . envFunc { withHoogle = true ; } ;
14
+ defaultPackage = aeson ;
15
+ }
16
+ ) // {
17
+ overlay = self : super :
18
+ let
19
+ hpkgs = super . haskellPackages ;
20
+ aeson = hpkgs . callCabal2nix "aeson" ./. { } ;
21
+ in
22
+ with super ; with haskell . lib ;
23
+ {
24
+ inherit aeson ;
25
+ aeson-dev = addBuildTools aeson [
26
+ haskell-language-server
27
+ cabal-install
28
+ ] ;
29
+ } ;
30
+ } ;
31
+ }
Original file line number Diff line number Diff line change @@ -510,7 +510,7 @@ argsToValue target jc tvMap opts multiCons
510
510
()
511
511
| TaggedFlatObject {tagFieldName} <- sumEncoding opts -> do
512
512
let tag = pairE tagFieldName (conStr target opts conName)
513
- fromPairsE $ infixApp tag [| (<>) | ] pairs
513
+ fromPairsE $ infixApp tag [| (Monoid. <>) | ] pairs
514
514
| otherwise -> recordSumToValue target opts multiCons (null argTys) conName pairs)
515
515
[]
516
516
@@ -763,7 +763,7 @@ consFromJSON jc tName opts instTys cons = do
763
763
case sumEncoding opts of
764
764
TaggedObject {tagFieldName, contentsFieldName} ->
765
765
parseObject $ parseTaggedObject tvMap tagFieldName contentsFieldName
766
- TaggedFlatObject {tagFieldName} ->
766
+ TaggedFlatObject {tagFieldName} ->
767
767
parseObject $ parseTaggedFlatObject tvMap tagFieldName
768
768
UntaggedValue -> error " UntaggedValue: Should be handled already"
769
769
ObjectWithSingleField ->
You can’t perform that action at this time.
0 commit comments