From 2606ad2af0b70c330618842f0f21db5d65e02dea Mon Sep 17 00:00:00 2001 From: Mel Zuser Date: Tue, 27 Aug 2024 05:28:10 -0400 Subject: [PATCH] mkApp was added back --- src/Data/Docker/Nix/FetchDocker.hs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Data/Docker/Nix/FetchDocker.hs b/src/Data/Docker/Nix/FetchDocker.hs index 582ff20..7e0edbe 100644 --- a/src/Data/Docker/Nix/FetchDocker.hs +++ b/src/Data/Docker/Nix/FetchDocker.hs @@ -54,14 +54,10 @@ inheritAdapter sourceName sourceLine sourceColumn ks = Nix.Expr.inherit SourcePos{..} #endif --- | @hnix-0.5.0@ omits mkApp. +-- | @hnix-0.5.0@ omits mkApp but it was added back in @hnix-0.17.0@ #if MIN_VERSION_hnix(0,5,0) && !MIN_VERSION_hnix(0,17,0) mkApp :: NExpr -> NExpr -> NExpr mkApp e = Fix . NBinary NApp e -#elif MIN_VERSION_hnix(0,17,0) --- see: https://github.com/haskell-nix/hnix/pull/1042 -mkApp :: NExpr -> NExpr -> NExpr -mkApp e = Fix . NApp e #endif {- Example output of the pretty-printed, generated Nix expression AST.