diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-22 16:46:36 -0800 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-12-15 05:13:46 -0800 |
| commit | 80472e375406bb8f130b7d1e360fe89d042f7661 (patch) | |
| tree | be8993140e6dcdd5e706dc46e9cdbda89be9f7d6 /pkgs/development/haskell-modules | |
| parent | cd99109202945cf00116dc70af2f31eb66e10695 (diff) | |
treewide: add __attrsFailEvaluation and __recurseIntoDerivationForReleaseJobs
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7bc1fa0f7e83..e766203bd1f0 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -18,7 +18,8 @@ let haskellPackages = pkgs.callPackage makePackageSet { package-set = initialPackages; - inherit stdenv haskellLib ghc buildHaskellPackages extensible-self all-cabal-hashes; + inherit stdenv haskellLib ghc extensible-self all-cabal-hashes; + buildHaskellPackages = buildHaskellPackages // { __attrsFailEvaluation = true; }; }; platformConfigurations = lib.optionals stdenv.hostPlatform.isAarch [ diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index c39c934bed64..294ca295f22b 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -614,7 +614,7 @@ in package-set { inherit pkgs lib callPackage; } self // { Type: [str] -> drv -> drv */ generateOptparseApplicativeCompletions = - self.callPackage ( + (self.callPackage ( { stdenv }: commands: @@ -623,7 +623,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 |