From 77fe5ae244044424c6eeb8a8441ca24d046487d7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 26 Feb 2021 00:30:22 +0100 Subject: [PATCH] haskellPackages.hnix: generate completions again As stated in the original comment, since we have moved to GHC 8.10.x, the hnix binary builds again and we can generate completions for it. --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8ab7e06af2e1..433060b44057 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -212,12 +212,8 @@ self: super: { # base bound digit = doJailbreak super.digit; - # 2020-06-05: HACK: does not pass own build suite - `dontCheck` We should - # generate optparse-applicative completions for the hnix executable. Sadly - # building of the executable has been disabled for ghc < 8.10 in hnix. - # Generating the completions should be activated again, once we default to - # ghc 8.10. - hnix = dontCheck super.hnix; + # 2020-06-05: HACK: does not pass own build suite - `dontCheck` + hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck super.hnix); # https://github.com/haskell-nix/hnix-store/issues/127 hnix-store-core = addTestToolDepend super.hnix-store-core self.tasty-discover;