Skip to content

haskellPackages: remove __attrsFailEvaluation, buildHaskellPackages, and generateOptparseApplicativeCompletions special cases #324691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infinisil merged 1 commit into from
Jul 26, 2024
Merged

haskellPackages: remove __attrsFailEvaluation, buildHaskellPackages, and generateOptparseApplicativeCompletions special cases #324691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
};

Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/haskell-modules/make-package-set.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ in package-set { inherit pkgs lib callPackage; } self // {
Type: [str] -> drv -> drv
*/
generateOptparseApplicativeCompletions =
(self.callPackage (
self.callPackage (
{ stdenv }:

commands:
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/release-attrpaths-superset.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,8 @@ let
pkgs = true;
test-pkgs = true;

buildHaskellPackages = true;
buildPackages = true;
buildFreebsd = true;
generateOptparseApplicativeCompletions = true;

callPackage = true;
mkDerivation = true;
Expand Down