From 516057ffa9746ac1bf58d5a868957c18c5b5a252 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 18 Feb 2016 18:15:14 -0500 Subject: ghcjs: replace integer-simple with integer-gmp GHCJS uses integer-gmp, but cabal2nix generates a dependency list that includes integer-simple instead. This tweaks the stage2 generator to replace any instance of integer-simple with integer-gmp. Things currently still work without this change (assuming integer-simple is defined as null), as ghcjs includes integer-gmp in its stage1 packages - so it's always available. However, this change makes things a bit more explicit, rather than leaving things to chance. If at any point the stage1 packages are also split up into separate derivations, the integer-gmp package will need to be passed along to the packages that depend on it. This change should prevent some confusion going forward. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development/haskell-modules/configuration-ghcjs.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 53da845210e..ac7a30d4cfb 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -49,7 +49,11 @@ self: super: time = null; transformers = null; unix = null; - integer-simple = null; + + # Don't set integer-simple to null! + # GHCJS uses integer-gmp, so any package expression that depends on + # integer-simple is wrong. + #integer-simple = null; # These packages are core libraries in GHC 7.10.x, but not here. bin-package-db = null; -- cgit 1.4.1