From 704677d109df94fb9360ce4e60329b0578537e3f Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 4 Jul 2024 15:28:48 -0700
Subject: [PATCH] haskellPackages: remove __attrsFailEvaluation,
 buildHaskellPackages, and generateOptparseApplicativeCompletions special
 cases

---
 pkgs/development/haskell-modules/default.nix          | 2 ++
 pkgs/development/haskell-modules/make-package-set.nix | 4 ++--
 pkgs/top-level/release-attrpaths-superset.nix         | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 73ce1af7735a..db247f703052 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -20,6 +20,8 @@ let
   haskellPackages = pkgs.callPackage makePackageSet {
     package-set = initialPackages;
     inherit stdenv haskellLib ghc extensible-self all-cabal-hashes;
+
+    # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here.
     buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; };
   };
 
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 50dc7414ca93..b07196db9b7f 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -624,7 +624,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
        Type: [str] -> drv -> drv
     */
     generateOptparseApplicativeCompletions =
-      (self.callPackage (
+      self.callPackage (
         { stdenv }:
 
         commands:
@@ -633,7 +633,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
         if stdenv.buildPlatform.canExecute stdenv.hostPlatform
         then lib.foldr haskellLib.__generateOptparseApplicativeCompletion pkg commands
         else pkg
-      ) { }) // { __attrsFailEvaluation = true; };
+      ) { };
 
     /*
       Modify given Haskell package to force GHC to employ the LLVM
diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix
index 489c378abf04..e9b13437742a 100644
--- a/pkgs/top-level/release-attrpaths-superset.nix
+++ b/pkgs/top-level/release-attrpaths-superset.nix
@@ -77,10 +77,8 @@ let
     pkgs = true;
     test-pkgs = true;
 
-    buildHaskellPackages = true;
     buildPackages = true;
     buildFreebsd = true;
-    generateOptparseApplicativeCompletions = true;
 
     callPackage = true;
     mkDerivation = true;