Merge branch 'develop' into je-clean-up-changelog-traverse

Author: Ericson2314

default.nix

@@ -19,9 +19,16 @@ let
     ];
     hsPkgs = lib.genAttrs compilers (ghc: let
       ghc' = reflex-platform.${ghc}.override {
-        overrides = self: super: {
-          reflex-dontUseTemplateHaskell = self.callPackage ./. { useTemplateHaskell = false; };
-          reflex = self.callPackage ./. { useTemplateHaskell = true; };
+        overrides = self: super: let
+          reflexSrc = builtins.filterSource (path: type: !(builtins.elem (baseNameOf path) [
+            "default.nix"
+            "release.nix"
+            ".git"
+            "dist"
+          ])) ./.;
+        in {
+          reflex-dontUseTemplateHaskell = self.callCabal2nixWithOptions "reflex" reflexSrc "-f -use-template-haskell" {};
+          reflex = self.callCabal2nixWithOptions "reflex" reflexSrc "-f +use-template-haskell" {};
         };
       };
     in {