about summary refs log tree commit diff
path: root/pkgs/top-level/haskell-defaults.nix
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2014-12-27 16:51:39 -0500
committerCharles Strahan <charles.c.strahan@gmail.com>2014-12-27 16:51:39 -0500
commitf36fabb389ed9eec6911f341859a8ddab9e9de88 (patch)
treeaf1af975c492ba89262fe7be227782a68d3f70a1 /pkgs/top-level/haskell-defaults.nix
parenta188373640738d81cfb18a3f7330ac23e99443cc (diff)
downloadnixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar
nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.gz
nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.bz2
nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.lz
nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.xz
nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.tar.zst
nixlib-f36fabb389ed9eec6911f341859a8ddab9e9de88.zip
ghcjs: fix build
Diffstat (limited to 'pkgs/top-level/haskell-defaults.nix')
-rw-r--r--pkgs/top-level/haskell-defaults.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index 9d8177d49b8b..95520ee94af4 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -236,12 +236,11 @@
              };
 
   packages_ghcjs =
-    let parent = packages_ghc783.override {
+    let parent = packages_ghc784.override {
           extension = self: super: {
             ghcjs = super.ghcjs.override {
-              Cabal = packages_ghc783.CabalGhcjs;
+              Cabal = packages_ghc784.CabalGhcjs;
             };
-            transformersCompat = super.transformersCompat_0_3_3_3;
             network = super.network_2_6_0_2;
             haddock = super.haddock.override {
               Cabal = null;
@@ -338,7 +337,7 @@
         tfRandom = self.callPackage ../development/libraries/haskell/tf-random {};
 
 /*
-        buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; }, cabal2nix ? packages_ghc783.cabal2nix }: let
+        buildLocalCabalWithArgs = { src, name, args ? {}, cabalDrvArgs ? { jailbreak = true; }, cabal2nix ? packages_ghc784.cabal2nix }: let
           cabalExpr = pkgs.stdenv.mkDerivation ({
             name = "${name}.nix";
 
@@ -361,7 +360,7 @@
       };
       extension = self: super: {
         buildLocalCabalWithArgs = args: super.buildLocalCabalWithArgs (args // {
-          nativePkgs = packages_ghc783;
+          nativePkgs = packages_ghc784;
         });
       };
     };