From e6e9970891781768d85a1c3005c2486b591723c7 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 18 Feb 2016 15:00:34 -0500 Subject: [PATCH] ghcjs: don't propagate Cabal to all packages Previously, we were compiling Setup.hs with ghcjs (instead of ghc), and that required that Cabal be available, otherwise the Setup.hs would fail to compile. Now that we are compiling Setup.hs with ghc, it's no longer necessary to add Cabal as a dependency to all ghcjs packages. --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index dfdad72cd3d..53da845210e 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -21,13 +21,6 @@ self: super: ''; }); - mkDerivation = drv: super.mkDerivation (drv // { - # Need Cabal lib to be available. - libraryHaskellDepends = drv.libraryHaskellDepends - # Be careful not to end up in infinite recursion! - ++ pkgs.lib.optional (!(builtins.elem drv.pname ["Cabal" "hscolour"])) self.Cabal; - }); - # LLVM is not supported on this GHC; use the latest one. inherit (pkgs) llvmPackages;