From 1ec1f5a45a414caf7568b33d6f526bf2d4de2719 Mon Sep 17 00:00:00 2001 From: Mel Zuser Date: Tue, 27 Aug 2024 05:10:01 -0400 Subject: [PATCH 1/2] Support hnix-0.17 --- src/Data/Docker/Nix/FetchDocker.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Data/Docker/Nix/FetchDocker.hs b/src/Data/Docker/Nix/FetchDocker.hs index edc3762..582ff20 100644 --- a/src/Data/Docker/Nix/FetchDocker.hs +++ b/src/Data/Docker/Nix/FetchDocker.hs @@ -55,9 +55,13 @@ inheritAdapter sourceName sourceLine sourceColumn ks = Nix.Expr.inherit #endif -- | @hnix-0.5.0@ omits mkApp. -#if MIN_VERSION_hnix(0,5,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. From 67d0354af3ff26316ad8512cd799860c8e839872 Mon Sep 17 00:00:00 2001 From: Mel Zuser Date: Tue, 27 Aug 2024 05:28:10 -0400 Subject: [PATCH 2/2] 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..001dd21 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. #if MIN_VERSION_hnix(0,5,0) && !MIN_VERSION_hnix(0,17,0) +-- | @hnix-0.5.0@ omits mkApp but it was added back in @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.