Skip to content

Commit 75e3a73

Browse files
authored
Merge pull request #741 from expipiplus1/joe-fix-qq
Fix QQ Text lifting error
2 parents c0ed91f + 9920802 commit 75e3a73

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/Nix/TH.hs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import qualified Data.Text as Text
1717
import Data.List.NonEmpty ( NonEmpty(..) )
1818
import Data.Maybe ( mapMaybe )
1919
import Language.Haskell.TH
20+
import Language.Haskell.TH.Syntax ( liftString )
2021
import Language.Haskell.TH.Quote
2122
import Nix.Atoms
2223
import Nix.Expr
@@ -27,7 +28,12 @@ quoteExprExp s = do
2728
expr <- case parseNixText (Text.pack s) of
2829
Failure err -> fail $ show err
2930
Success e -> pure e
30-
dataToExpQ (const Nothing `extQ` metaExp (freeVars expr)) expr
31+
dataToExpQ
32+
(const Nothing `extQ` metaExp (freeVars expr) `extQ` (Just . liftText))
33+
expr
34+
where
35+
liftText :: Text.Text -> Q Exp
36+
liftText txt = AppE (VarE 'Text.pack) <$> liftString (Text.unpack txt)
3137

3238
quoteExprPat :: String -> PatQ
3339
quoteExprPat s = do

0 commit comments

Comments
 (0)