From 6f241f7cec70bbacd6cb3e4c672987e09fb74e9d Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Tue, 20 Sep 2022 02:11:26 +0200
Subject: [PATCH] haskellPackages: Move permanent overrides to
 configuration.nix

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 -----
 pkgs/development/haskell-modules/configuration-nix.nix    | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a5d1ba5f3c09..a0900d72cf17 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1010,11 +1010,6 @@ self: super: {
   # https://github.com/haskell-hvr/hgettext/issues/14
   hgettext = doJailbreak super.hgettext;
 
-  # Generate shell completion.
-  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
-
-  ormolu = generateOptparseApplicativeCompletion "ormolu" super.ormolu;
-
   stack =
     generateOptparseApplicativeCompletion "stack"
       (doJailbreak # for Cabal constraint added on hackage
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index cc163ec74cec..503601a1b656 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -96,8 +96,11 @@ self: super: builtins.intersectAttrs super {
 
   # avoid compiling twice by providing executable as a separate output (with small closure size)
   niv = enableSeparateBinOutput (generateOptparseApplicativeCompletion "niv" super.niv);
-  ormolu = enableSeparateBinOutput super.ormolu;
   ghcid = enableSeparateBinOutput super.ghcid;
+  ormolu = generateOptparseApplicativeCompletion "ormolu" (enableSeparateBinOutput super.ormolu);
+
+  # Generate shell completion.
+  cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
 
   arbtt = overrideCabal (drv: {
     # The test suite needs the packages's executables in $PATH to succeed.