Unverified Commit 4888d266 authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #324691 from philiptaron/__attrsFailEvaluation/haskell 

haskellPackages: remove __attrsFailEvaluation, buildHaskellPackages, and generateOptparseApplicativeCompletions special cases
parents 29016e9c 704677d1

pkgs/development/haskell-modules/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -77,10 +77,8 @@ let 
    pkgs = true;

    test-pkgs = true;



    buildHaskellPackages = true;

    buildPackages = true;

    buildFreebsd = true;

    generateOptparseApplicativeCompletions = true;



    callPackage = true;

    mkDerivation = true;