diff options
author | Peter Simons <simons@cryp.to> | 2018-01-21 19:55:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-21 19:55:25 +0100 |
commit | 4532826e99e1d0eda2044189538a99a0ac458af4 (patch) | |
tree | d74db6ee8291136cb42f2bab6b56f225485af4d0 | |
parent | 46947c49a0b1aa99ab8df3f8741fffab2273fe38 (diff) | |
parent | fcc8cae88d5429ae2693b03e870dfc4fe6a1c6bf (diff) |
Merge pull request #34037 from ElvishJerricco/fix-ghcjs-lts-10
Fixed GHCJS
-rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/ghcjs/head.nix | 4 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 8 |
6 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 4a583af0cfe7b..ab72d1fb1b3d6 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -174,6 +174,7 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; socket-io = pkgs.nodePackages."socket.io"; + haskellCompilerName = "ghcjs"; # let us assume ghcjs is never actually cross compiled targetPrefix = ""; diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index ff989ea22c402..7f3cc94400158 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,5 +1,5 @@ -{ bootPkgs }: +{ bootPkgs, cabal-install }: bootPkgs.callPackage ./base.nix { - inherit bootPkgs; + inherit bootPkgs cabal-install; } diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 2cf6c8b39c240..84eb2d8bd0dac 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,9 +1,9 @@ -{ fetchgit, fetchFromGitHub, bootPkgs }: +{ fetchgit, fetchFromGitHub, bootPkgs, cabal-install }: bootPkgs.callPackage ./base.nix { version = "0.2.020170323"; - inherit bootPkgs; + inherit bootPkgs cabal-install; ghcjsSrc = fetchFromGitHub { owner = "ghcjs"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5922cd1272d3b..3cc0aec922cd8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -949,4 +949,7 @@ self: super: { # Add support for https://github.com/haskell-hvr/multi-ghc-travis. multi-ghc-travis = self.callPackage ../tools/haskell/multi-ghc-travis { ShellCheck = self.ShellCheck_0_4_6; }; + # https://github.com/yesodweb/Shelly.hs/issues/162 + shelly = dontCheck super.shelly; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 804da79f5689d..30be6a031d4fb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -68,4 +68,8 @@ self: super: { # inline-c > 0.5.6.0 requires template-haskell >= 2.12 inline-c = super.inline-c_0_5_6_1; inline-c-cpp = super.inline-c-cpp_0_1_0_0; + + # Newer versions require GHC 8.2. + haddock-api = self.haddock-api_2_17_4; + haddock = self.haddock_2_17_5; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0ecb520977983..8f035cfd57560 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; |