Skip to content

Commit

Permalink
Merge remote-tracking branch 'luigy/fix-disable-use-template-haskell'…
Browse files Browse the repository at this point in the history
… into develop
  • Loading branch information
ali-abrar committed Aug 16, 2023
2 parents 097b6dd + ad03ad6 commit a65ee96
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion reflex-dom-core/src/Reflex/Dom/Builder/Class/Events.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ module Reflex.Dom.Builder.Class.Events where
#ifdef USE_TEMPLATE_HASKELL
import Data.GADT.Compare.TH
#else
import Data.Type.Equality ((:~:)(..))
import Data.GADT.Compare
(GOrdering(..), (:~:)(..), GEq(..), GCompare(..))
(GOrdering(..), GEq(..), GCompare(..))
#endif
import Data.Text (Text)

Expand Down
4 changes: 3 additions & 1 deletion release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

let
native-reflex-platform = reflex-platform-fun {};
inherit (native-reflex-platform.nixpkgs) lib;
inherit (native-reflex-platform.nixpkgs) lib haskell;

tests = system: import ./test { pkgs = (reflex-platform-fun { inherit system; }).nixpkgs; };

Expand Down Expand Up @@ -55,11 +55,13 @@ let
./test
])) ./.;
};
reflex-dom-core_disable-use-template-haskell = haskell.lib.disableCabalFlag super.reflex-dom-core "use-template-haskell";
})
];
};
all = tests system // {
inherit (reflex-platform.${ghc})
reflex-dom-core_disable-use-template-haskell
reflex-dom-core
reflex-dom
;
Expand Down

0 comments on commit a65ee96

Please sign in to comment.