From d590a0f4b63901766b94ef8691baa389db56d074 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Thu, 12 Mar 2015 23:20:56 -0400 Subject: ghcjs: support for Haskell-NG closes #5828 closes #6786 --- pkgs/top-level/haskell-packages.nix | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'pkgs/top-level/haskell-packages.nix') diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e6c49c1aad87..51141e5ef00f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -103,15 +103,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in extension = self : super : {}; }; - cabalJs = callPackage ../build-support/cabal/ghcjs.nix { - Cabal = null; # prefer the Cabal version shipped with the compiler - hscolour = self.hscolourBootstrap; - inherit enableLibraryProfiling enableCheckPhase - enableStaticLibraries enableSharedLibraries enableSharedExecutables; - glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : {}; - }; - # A variant of the cabal build driver that disables unit testing. # Useful for breaking cycles, where the unit test of a package A # depends on package B, which has A as a regular build input. @@ -968,14 +959,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcid = callPackage ../development/tools/haskell/ghcid {}; - ghcjs = callPackage ../development/compilers/ghcjs { - Cabal = self.Cabal_1_22_0_0; - cabalInstall = self.cabalInstall_1_22_0_0; - haddock = self.haddock.override { - Cabal = null; - }; - }; - ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {}; ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; -- cgit 1.4.1