diff --git a/default.nix b/default.nix index 6ad73da8e..2e89507b6 100644 --- a/default.nix +++ b/default.nix @@ -414,6 +414,7 @@ let overrideCabal = pkg: f: if pkg == null then null else haskellLib.overrideCab ghcIosSimulator64 = (extendHaskellPackages nixpkgsCross.ios.simulator64.pkgs.haskell.packages.ghc842).override { overrides = nixpkgs.lib.foldr nixpkgs.lib.composeExtensions (_: _: {}) [ (optionalExtension enableExposeAllUnfoldings haskellOverlays.exposeAllUnfoldings) + haskellOverlays.disableTemplateHaskell haskellOverlays.ghc-8_4_2 ]; }; diff --git a/haskell-overlays/disable-template-haskell.nix b/haskell-overlays/disable-template-haskell.nix index b6c0468ff..ff151f809 100644 --- a/haskell-overlays/disable-template-haskell.nix +++ b/haskell-overlays/disable-template-haskell.nix @@ -14,7 +14,7 @@ in self: super: { # Export all modules, and some additional functions preConfigure = '' sed -i '/^library/,/^test-suite/ s/other-modules:/exposed-modules:/' *.cabal - sed -i "/^module Data.Aeson.TH/,/) where/ { /^module/b; /) where/ { s/) where/, LookupField (..), parseTypeMismatch, parseTypeMismatch', valueConName, keyValuePairWith) where/; b }; }" Data/Aeson/TH.hs + sed -i "/^module Data.Aeson.TH/,/) where/ { /^module/b; /) where/ { s/) where/, LookupField (..), parseTypeMismatch, parseTypeMismatch', valueConName) where/; b }; }" Data/Aeson/TH.hs ${drv.preConfigure or ""} ''; });