nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 22:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages: remove __attrsFailEvaluation, buildHaskellPackages, and generateOptparseApplicativeCompletions special cases

Browse Source
This commit is contained in:
Philip Taron 2024-07-04 15:28:48 -07:00
parent b1afdbff75
commit 704677d109
No known key found for this signature in database
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/default.nix
View File

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

4
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -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

2
pkgs/top-level/release-attrpaths-superset.nix
View File

@ -77,10 +77,8 @@ let
pkgs = true;
test-pkgs = true;
buildHaskellPackages = true;
buildPackages = true;
buildFreebsd = true;
generateOptparseApplicativeCompletions = true;
callPackage = true;
mkDerivation = true;