public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-stack: clean up deep overrides

This commit is contained in:
Peter Simons 2019-06-19 15:36:22 +00:00
parent 3a1a49c9ab
commit f399f890dd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1103,10 +1103,11 @@ self: super: {
stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: {
ansi-terminal = self.ansi-terminal_0_9_1; ansi-terminal = self.ansi-terminal_0_9_1;
concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions.
http-download = dontCheck (unmarkBroken super.http-download);
pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp);
rio = self.rio_0_1_9_2; rio = self.rio_0_1_9_2;
hi-file-parser = dontCheck super.hi-file-parser; # Avoid depending on newer hspec versions. rio-prettyprint = unmarkBroken super.rio-prettyprint;
http-download = dontCheck super.http-download;
pantry-tmp = dontCheck super.pantry-tmp;
})); }));
# musl fixes # musl fixes

1
pkgs/development/haskell-modules/lib.nix
View File

@ -161,6 +161,7 @@ rec {
disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";
markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; }); markBroken = drv: overrideCabal drv (drv: { broken = true; hydraPlatforms = []; });
unmarkBroken = drv: overrideCabal drv (drv: { broken = false; });
markBrokenVersion = version: drv: assert drv.version == version; markBroken drv; markBrokenVersion = version: drv: assert drv.version == version; markBroken drv;
enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; }); enableLibraryProfiling = drv: overrideCabal drv (drv: { enableLibraryProfiling = true; });