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>2014-12-27 22:09:05 -0500
committerCharles Strahan <charles.c.strahan@gmail.com>2014-12-27 22:09:05 -0500
commita8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1 (patch)
tree02119045f7cfb6c1926bc8d33096cf190667f890 /pkgs/top-level/haskell-packages.nix
parent94aa6539ded155b86bc9077fb624a2ee6a14e7e6 (diff)
downloadnixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.tar
nixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.tar.gz
nixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.tar.bz2
nixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.tar.lz
nixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.tar.xz
nixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.tar.zst
nixpkgs-a8d78dffb0c0f7d4eaca2b3d3f3478ceffa485f1.zip
ghcjs: don't use extension to set Cabal
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r--pkgs/top-level/haskell-packages.nix3
1 files changed, 2 insertions, 1 deletions
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 {};