From a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 27 Dec 2014 22:09:05 -0500 Subject: [PATCH] ghcjs: don't use extension to set Cabal --- pkgs/top-level/haskell-defaults.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index be464a3d20e..369f52854dc 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -247,10 +247,6 @@ packages_ghcjs = let parent = packages_ghc784.override { extension = self: super: { - ghcjs = super.ghcjs.override { - Cabal = packages_ghc784.Cabal_1_22_0_0; - cabalInstall = packages_ghc784.cabalInstall_1_22_0_0; - }; haddock = super.haddock.override { Cabal = null; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5a47a16028e..b1ea0b08bc3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -938,7 +938,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; ghcjs = callPackage ../development/tools/haskell/ghcjs { - Cabal = self.Cabal_1_18_1_3; + Cabal = self.Cabal_1_22_0_0; + cabalInstall = self.cabalInstall_1_22_0_0; }; ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {};