talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

pkgs.haskell.lib: Add disableParallelBuilding function

Browse Source
This commit is contained in:
Rodney Lorrimar 2024-09-18 12:36:19 +08:00 committed by sternenseemann
parent 3abd3dab62
commit e2d259ebc0
9 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/languages-frameworks/haskell.section.md
View File

@ -1076,6 +1076,9 @@ benchmark component.
`disableLibraryProfiling drv` `disableLibraryProfiling drv`
: Sets the `enableLibraryProfiling` argument to `false` for `drv`. : Sets the `enableLibraryProfiling` argument to `false` for `drv`.
`disableParallelBuilding drv`
: Sets the `enableParallelBuilding` argument to `false` for `drv`.
#### Library functions in the Haskell package sets {#haskell-package-set-lib-functions} #### Library functions in the Haskell package sets {#haskell-package-set-lib-functions}
Some library functions depend on packages from the Haskell package sets. Thus they are Some library functions depend on packages from the Haskell package sets. Thus they are

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -2458,9 +2458,7 @@ self: super: {
# See: https://gitlab.haskell.org/ghc/ghc/-/issues/17188 # See: https://gitlab.haskell.org/ghc/ghc/-/issues/17188
# #
# Overwrite the build cores # Overwrite the build cores
raaz = overrideCabal (drv: { raaz = disableParallelBuilding super.raaz;
enableParallelBuilding = false;
}) super.raaz;
# https://github.com/andreymulik/sdp/issues/3 # https://github.com/andreymulik/sdp/issues/3
sdp = disableLibraryProfiling super.sdp; sdp = disableLibraryProfiling super.sdp;

1
pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
View File

@ -5,7 +5,6 @@ with haskellLib;
let let
inherit (pkgs) lib; inherit (pkgs) lib;
disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; });
in in
self: super: { self: super: {

1
pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
View File

@ -3,7 +3,6 @@
let let
inherit (pkgs) lib; inherit (pkgs) lib;
disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; });
in in
self: super: { self: super: {

2
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View File

@ -15,8 +15,6 @@ let
builtins.throw "Check if '${msg}' was resolved in ${pkg.pname} ${pkg.version} and update or remove this"; builtins.throw "Check if '${msg}' was resolved in ${pkg.pname} ${pkg.version} and update or remove this";
jailbreakForCurrentVersion = p: v: checkAgainAfter p v "bad bounds" (doJailbreak p); jailbreakForCurrentVersion = p: v: checkAgainAfter p v "bad bounds" (doJailbreak p);
# Workaround for a ghc-9.6 issue: https://gitlab.haskell.org/ghc/ghc/-/issues/23392
disableParallelBuilding = overrideCabal (drv: { enableParallelBuilding = false; });
in in
self: super: { self: super: {

1
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View File

@ -5,7 +5,6 @@ with haskellLib;
let let
inherit (pkgs.stdenv.hostPlatform) isDarwin; inherit (pkgs.stdenv.hostPlatform) isDarwin;
disableParallelBuilding = haskellLib.overrideCabal (drv: { enableParallelBuilding = false; });
in in
self: super: { self: super: {

6
pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
View File

@ -2,12 +2,6 @@
with haskellLib; with haskellLib;
let
disableParallelBuilding = overrideCabal (drv: {
enableParallelBuilding = false;
});
in
# cabal2nix doesn't properly add dependencies conditional on arch(javascript) # cabal2nix doesn't properly add dependencies conditional on arch(javascript)
(self: super: { (self: super: {

7
pkgs/development/haskell-modules/lib/compose.nix
View File

@ -184,6 +184,13 @@ rec {
markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
markUnbroken = overrideCabal (drv: { broken = false; }); markUnbroken = overrideCabal (drv: { broken = false; });
/* disableParallelBuilding drops the -j<n> option from the GHC
command line for the given package. This can be useful in rare
situations where parallel building of a package causes GHC to
fail for some reason.
*/
disableParallelBuilding = overrideCabal (drv: { enableParallelBuilding = false; });
enableLibraryProfiling = overrideCabal (drv: { enableLibraryProfiling = true; }); enableLibraryProfiling = overrideCabal (drv: { enableLibraryProfiling = true; });
disableLibraryProfiling = overrideCabal (drv: { enableLibraryProfiling = false; }); disableLibraryProfiling = overrideCabal (drv: { enableLibraryProfiling = false; });

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

@ -176,6 +176,8 @@ rec {
markBrokenVersion = compose.markBrokenVersion; markBrokenVersion = compose.markBrokenVersion;
markUnbroken = compose.markUnbroken; markUnbroken = compose.markUnbroken;
disableParallelBuilding = compose.disableParallelBuilding;
enableLibraryProfiling = compose.enableLibraryProfiling; enableLibraryProfiling = compose.enableLibraryProfiling;
disableLibraryProfiling = compose.disableLibraryProfiling; disableLibraryProfiling = compose.disableLibraryProfiling;