Skip to content

Commit 13f0e48

Browse files
author
Poscat
committed
Fix semigroup
1 parent d77552b commit 13f0e48

File tree

2 files changed

+33
-2
lines changed

2 files changed

+33
-2
lines changed

flake.nix

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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+
}

src/Data/Aeson/TH.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ argsToValue target jc tvMap opts multiCons
510510
()
511511
| TaggedFlatObject {tagFieldName} <- sumEncoding opts -> do
512512
let tag = pairE tagFieldName (conStr target opts conName)
513-
fromPairsE $ infixApp tag [|(<>)|] pairs
513+
fromPairsE $ infixApp tag [|(Monoid.<>)|] pairs
514514
| otherwise -> recordSumToValue target opts multiCons (null argTys) conName pairs)
515515
[]
516516

@@ -763,7 +763,7 @@ consFromJSON jc tName opts instTys cons = do
763763
case sumEncoding opts of
764764
TaggedObject {tagFieldName, contentsFieldName} ->
765765
parseObject $ parseTaggedObject tvMap tagFieldName contentsFieldName
766-
TaggedFlatObject {tagFieldName} ->
766+
TaggedFlatObject {tagFieldName} ->
767767
parseObject $ parseTaggedFlatObject tvMap tagFieldName
768768
UntaggedValue -> error "UntaggedValue: Should be handled already"
769769
ObjectWithSingleField ->

0 commit comments

Comments
 (0)