dhall-nix 1.1.19 → 1.1.20
raw patch · 2 files changed
+15/−15 lines, 2 filesdep ~dhalldep ~hnixPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: dhall, hnix
API changes (from Hackage documentation)
Files
- dhall-nix.cabal +3/−3
- src/Dhall/Nix.hs +12/−12
dhall-nix.cabal view
@@ -1,5 +1,5 @@ Name: dhall-nix-Version: 1.1.19+Version: 1.1.20 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.0.1@@ -30,8 +30,8 @@ base >= 4.11.0.0 && < 5 , containers < 0.7 , data-fix < 0.4 ,- dhall >= 1.36 && < 1.38,- hnix >= 0.7 && < 0.12,+ dhall >= 1.36 && < 1.39,+ hnix >= 0.7 && < 0.13, lens-family-core >= 1.0.0 && < 2.2 , neat-interpolation < 0.6 , text >= 0.8.0.0 && < 1.3
src/Dhall/Nix.hs view
@@ -239,10 +239,10 @@ -- If any other number, then rename the variable to include the maximum -- depth. maximumDepth :: Var -> Expr s Void -> Maybe Int- maximumDepth v@(V x n) (Lam FunctionBinding {functionBindingVariable = x', functionBindingAnnotation = a} b)+ maximumDepth v@(V x n) (Lam _ FunctionBinding {functionBindingVariable = x', functionBindingAnnotation = a} b) | x == x' = max (maximumDepth v a) (fmap (+ 1) (maximumDepth (V x (n + 1)) b))- maximumDepth v@(V x n) (Pi x' a b)+ maximumDepth v@(V x n) (Pi _ x' a b) | x == x' = max (maximumDepth v a) (fmap (+ 1) (maximumDepth (V x (n + 1)) b)) maximumDepth (V x n) (Let (Binding { variable = x' }) a)@@ -274,14 +274,14 @@ x' = x <> Data.Text.pack (show n) renameShadowed :: Expr s Void -> Maybe (Expr s Void)- renameShadowed (Lam FunctionBinding { functionBindingVariable = x, functionBindingAnnotation = a} b) = do+ renameShadowed (Lam cs FunctionBinding { functionBindingVariable = x, functionBindingAnnotation = a} b) = do (x', b') <- rename (x, b) - return (Lam (Dhall.Core.makeFunctionBinding x' a) b')- renameShadowed (Pi x a b) = do+ return (Lam cs (Dhall.Core.makeFunctionBinding x' a) b')+ renameShadowed (Pi cs x a b) = do (x', b') <- rename (x, b) - return (Pi x' a b')+ return (Pi cs x' a b') renameShadowed (Let Binding{ variable = x, .. } a) = do (x' , a') <- rename (x, a) @@ -296,10 +296,10 @@ loop (Const _) = return untranslatable loop (Var (V a 0)) = return (Fix (NSym a)) loop (Var a ) = Left (CannotReferenceShadowedVariable a)- loop (Lam FunctionBinding { functionBindingVariable = a } c) = do+ loop (Lam _ FunctionBinding { functionBindingVariable = a } c) = do c' <- loop c return (Fix (NAbs (Param a) c'))- loop (Pi _ _ _) = return untranslatable+ loop (Pi _ _ _ _) = return untranslatable -- None needs a type to convert to an Optional loop (App None _) = return (Fix (NConstant NNull))@@ -545,7 +545,7 @@ return (NamedVar [StaticKey k] v Nix.nullPos) return (Fix (NSet NNonRecursive a'')) loop (Union _) = return untranslatable- loop (Combine _ a b) = do+ loop (Combine _ _ a b) = do a' <- loop a b' <- loop b let e0 = Fix (NBinary NApp (Fix (NBinary NApp "map" "toKeyVals")) "ks")@@ -586,7 +586,7 @@ let e11 = Fix (NBinary NApp (Fix (NBinary NApp "combine" a')) b') return (Fix (NLet [NamedVar ["combine"] combine Nix.nullPos] e11))- loop (CombineTypes _ _) = return untranslatable+ loop (CombineTypes _ _ _) = return untranslatable loop (Merge a b _) = do a' <- loop a b' <- loop b@@ -602,12 +602,12 @@ let map_ = Fix (NBinary NApp "map" (Fix (NAbs "k" (Fix (NSet NNonRecursive setBindings))))) let toMap = Fix (NAbs "kvs" (Fix (NBinary NApp map_ ks))) return (Fix (NBinary NApp toMap a'))- loop (Prefer _ b c) = do+ loop (Prefer _ _ b c) = do b' <- loop b c' <- loop c return (Fix (NBinary NUpdate b' c')) loop (RecordCompletion a b) =- loop (Annot (Prefer PreferFromCompletion (Field a def) b) (Field a typ))+ loop (Annot (Prefer mempty PreferFromCompletion (Field a def) b) (Field a typ)) where def = Dhall.Core.makeFieldSelection "default" typ = Dhall.Core.makeFieldSelection "Type"