diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2018-01-18 16:39:15 -0500 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2018-01-20 15:47:59 -0500 |
| commit | fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf (patch) | |
| tree | 54e2bd205bbcf34a93ac4937d28699780a173df2 /pkgs/top-level/haskell-packages.nix | |
| parent | 866717d75b64cb07cab16d0357edfd00cf339c20 (diff) | |
| download | nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.gz nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.bz2 nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.lz nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.xz nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.tar.zst nixlib-fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf.zip | |
Fixed GHCJS
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0ecb52097798..8f035cfd5756 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }: +{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform, cabal-install }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -91,10 +91,12 @@ in rec { selfPkgs = packages.ghcHEAD; }; ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { - bootPkgs = packages.ghc821Binary; + bootPkgs = packages.ghc7103; + inherit cabal-install; }; ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix { - bootPkgs = packages.ghc821Binary; + bootPkgs = packages.ghc802; + inherit cabal-install; }; ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec { bootPkgs = packages.ghc7103Binary; |