ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

haskell-streaming-commons: fix build on older GHC versions some more

Browse Source
This commit is contained in:
Peter Simons 2015-01-20 23:50:38 +01:00
parent ba67ad3c88
commit 1d6d5932cd
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
View File

@ -57,8 +57,8 @@ self: super: {
# The test suite depends on time >=1.4.0.2. # The test suite depends on time >=1.4.0.2.
cookie = dontCheck super.cookie ; cookie = dontCheck super.cookie ;
# bytestring >=0.10.2.0 # Work around bytestring >=0.10.2.0 requirement.
streaming-commons = addBuildTool super.streaming-commons self.bytestring-builder; streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
# Choose appropriate flags for our version of 'bytestring'. # Choose appropriate flags for our version of 'bytestring'.
bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";

4
pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
View File

@ -57,8 +57,8 @@ self: super: {
# The test suite depends on time >=1.4.0.2. # The test suite depends on time >=1.4.0.2.
cookie = dontCheck super.cookie ; cookie = dontCheck super.cookie ;
# bytestring >=0.10.2.0 # Work around bytestring >=0.10.2.0 requirement.
streaming-commons = addBuildTool super.streaming-commons self.bytestring-builder; streaming-commons = addBuildDepend super.streaming-commons self.bytestring-builder;
# Choose appropriate flags for our version of 'bytestring'. # Choose appropriate flags for our version of 'bytestring'.
bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder"; bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";

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

@ -25,6 +25,9 @@ rec {
addBuildTool = drv: x: addBuildTools drv [x]; addBuildTool = drv: x: addBuildTools drv [x];
addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; }); addBuildTools = drv: xs: overrideCabal drv (drv: { buildTools = (drv.buildTools or []) ++ xs; });
addBuildDepend = drv: x: addBuildDepends drv [x];
addBuildDepends = drv: xs: overrideCabal drv (drv: { buildDepends = (drv.buildDepends or []) ++ xs; });
enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}"; enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}";
disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}";