diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2018-05-29 17:39:21 -0400 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-29 23:39:21 +0200 |
| commit | 7a23f1accaccdbadfb28da89e00c2489aa96245c (patch) | |
| tree | 2cde34037f19ff31e4aafa61995c1059efae5791 /pkgs/top-level/haskell-packages.nix | |
| parent | b02b4648528ee377c717e59af7dfd836bde6c865 (diff) | |
| download | nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.tar nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.tar.gz nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.tar.bz2 nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.tar.lz nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.tar.xz nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.tar.zst nixlib-7a23f1accaccdbadfb28da89e00c2489aa96245c.zip | |
GHCJS darwin fixes (#41120)
* GHCJS darwin fixes * Fix ghcjs 80 and 710 packages * Add socket-io to ghcjs 82 and 84 passthru
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e6bd5ebb853..fab88ab180b5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -159,13 +159,13 @@ in rec { ghcjs = packages.ghcjs82; ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjs; + ghc = bh.compiler.ghcjs710; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; ghcjs80 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjsHEAD; + ghc = bh.compiler.ghcjs80; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; |