Add a hacky but working liftTyped instance

haskell-nix · Jan 8, 2021 · 51a3ff9 · Anton-Latukha · Jan 21, 2021 · 51a3ff9
1 parent 1b517a4
commit 51a3ff9
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 33 deletions.
diff --git a/src/Nix/Builtins.hs b/src/Nix/Builtins.hs
@@ -168,39 +168,7 @@ builtinsList = sequence
   , add0 Normal   "currentSystem"    currentSystem
   , add0 Normal   "currentTime"      currentTime_
   , add2 Normal   "deepSeq"          deepSeq
-
-    -- This is compiled in so that we only parse and evaluate it once, at
-    -- compile-time.
-  , add0 TopLevel "derivation" $(do
-      let Success expr = parseNixText [text|
-        drvAttrs @ { outputs ? [ "out" ], ... }:
-
-        let
-
-          strict = derivationStrict drvAttrs;
-
-          commonAttrs = drvAttrs
-            // (builtins.listToAttrs outputsList)
-            // { all = map (x: x.value) outputsList;
-                 inherit drvAttrs;
-               };
-
-          outputToAttrListElement = outputName:
-            { name = outputName;
-              value = commonAttrs // {
-                outPath = builtins.getAttr outputName strict;
-                drvPath = strict.drvPath;
-                type = "derivation";
-                inherit outputName;
-              };
-            };
-
-          outputsList = map outputToAttrListElement outputs;
-
-        in (builtins.head outputsList).value|]
-      [| foldFix Eval.eval expr |]
-    )
-
+  , add0 TopLevel "derivation"       derivation
   , add  TopLevel "derivationStrict" derivationStrict_
   , add  TopLevel "dirOf"            dirOf
   , add2 Normal   "div"              div_
@@ -306,6 +274,40 @@ builtinsList = sequence
 
 -- Primops
 
+derivation
+  :: forall e t f m. (MonadNix e t f m, Scoped (NValue t f m) m)
+  => m (NValue t f m)
+derivation = foldFix Eval.eval $$(do
+    -- This is compiled in so that we only parse it once at compile-time.
+    let Success expr = parseNixText [text|
+      drvAttrs @ { outputs ? [ "out" ], ... }:
+
+      let
+
+        strict = derivationStrict drvAttrs;
+
+        commonAttrs = drvAttrs
+          // (builtins.listToAttrs outputsList)
+          // { all = map (x: x.value) outputsList;
+               inherit drvAttrs;
+             };
+
+        outputToAttrListElement = outputName:
+          { name = outputName;
+            value = commonAttrs // {
+              outPath = builtins.getAttr outputName strict;
+              drvPath = strict.drvPath;
+              type = "derivation";
+              inherit outputName;
+            };
+          };
+
+        outputsList = map outputToAttrListElement outputs;
+
+      in (builtins.head outputsList).value|]
+    [|| expr ||]
+  )
+
 foldNixPath
   :: forall e t f m r
    . MonadNix e t f m

diff --git a/src/Nix/Expr/Types.hs b/src/Nix/Expr/Types.hs
@@ -182,6 +182,12 @@ instance Lift (Fix NExprF) where
       Just HRefl -> Just [| pack $(liftString $ unpack b) |]
       Nothing    -> Nothing
 
+#if MIN_VERSION_template_haskell(2,17,0)
+  liftTyped = unsafeCodeCoerce . lift
+#elif MIN_VERSION_template_haskell(2,16,0)
+  liftTyped = unsafeTExpCoerce . lift
+#endif
+
 -- | The monomorphic expression type is a fixed point of the polymorphic one.
 type NExpr = Fix NExprF