about summary refs log tree commit diff
path: root/pkgs/top-level/haskell-packages.nix
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2015-03-12 23:20:56 -0400
committerPeter Simons <simons@cryp.to>2015-03-29 03:34:04 +0200
commitd590a0f4b63901766b94ef8691baa389db56d074 (patch)
tree7bf5ab1aa0c0159aeff3ceca338117cc5f6ef5e1 /pkgs/top-level/haskell-packages.nix
parent1901f3fe77d24c0eef00f73f73c176fae3bcb44e (diff)
downloadnixlib-d590a0f4b63901766b94ef8691baa389db56d074.tar
nixlib-d590a0f4b63901766b94ef8691baa389db56d074.tar.gz
nixlib-d590a0f4b63901766b94ef8691baa389db56d074.tar.bz2
nixlib-d590a0f4b63901766b94ef8691baa389db56d074.tar.lz
nixlib-d590a0f4b63901766b94ef8691baa389db56d074.tar.xz
nixlib-d590a0f4b63901766b94ef8691baa389db56d074.tar.zst
nixlib-d590a0f4b63901766b94ef8691baa389db56d074.zip
ghcjs: support for Haskell-NG
closes #5828
closes #6786
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r--pkgs/top-level/haskell-packages.nix17
1 files changed, 0 insertions, 17 deletions
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 {};