Merge pull request #324691 from philiptaron/__attrsFailEvaluation/haskell

haskellPackages: remove __attrsFailEvaluation, buildHaskellPackages, and generateOptparseApplicativeCompletions special cases

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; };
   };
 

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

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;