public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed GHCJS

This commit is contained in:
Will Fancher 2018-01-18 16:39:15 -05:00
parent 866717d75b
commit fcc8cae88d
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/ghcjs/base.nix
View File

@ -174,6 +174,7 @@ in mkDerivation (rec {
isGhcjs = true; isGhcjs = true;
inherit nodejs ghcjsBoot; inherit nodejs ghcjsBoot;
socket-io = pkgs.nodePackages."socket.io"; socket-io = pkgs.nodePackages."socket.io";
haskellCompilerName = "ghcjs";
# let us assume ghcjs is never actually cross compiled # let us assume ghcjs is never actually cross compiled
targetPrefix = ""; targetPrefix = "";

4
pkgs/development/compilers/ghcjs/default.nix
View File

@ -1,5 +1,5 @@
{ bootPkgs }: { bootPkgs, cabal-install }:
bootPkgs.callPackage ./base.nix { bootPkgs.callPackage ./base.nix {
inherit bootPkgs; inherit bootPkgs cabal-install;
} }

4
pkgs/development/compilers/ghcjs/head.nix
View File

@ -1,9 +1,9 @@
{ fetchgit, fetchFromGitHub, bootPkgs }: { fetchgit, fetchFromGitHub, bootPkgs, cabal-install }:
bootPkgs.callPackage ./base.nix { bootPkgs.callPackage ./base.nix {
version = "0.2.020170323"; version = "0.2.020170323";
inherit bootPkgs; inherit bootPkgs cabal-install;
ghcjsSrc = fetchFromGitHub { ghcjsSrc = fetchFromGitHub {
owner = "ghcjs"; owner = "ghcjs";

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -946,4 +946,7 @@ self: super: {
# Add support for https://github.com/haskell-hvr/multi-ghc-travis. # 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; }; 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;
} }

4
pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View File

@ -68,4 +68,8 @@ self: super: {
# inline-c > 0.5.6.0 requires template-haskell >= 2.12 # inline-c > 0.5.6.0 requires template-haskell >= 2.12
inline-c = super.inline-c_0_5_6_1; inline-c = super.inline-c_0_5_6_1;
inline-c-cpp = super.inline-c-cpp_0_1_0_0; 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;
} }

8
pkgs/top-level/haskell-packages.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform }: { pkgs, lib, newScope, stdenv, buildPlatform, targetPlatform, cabal-install }:
let let
# These are attributes in compiler and packages that don't support integer-simple. # These are attributes in compiler and packages that don't support integer-simple.
@ -91,10 +91,12 @@ in rec {
selfPkgs = packages.ghcHEAD; selfPkgs = packages.ghcHEAD;
}; };
ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs { 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 { 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 { ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec {
bootPkgs = packages.ghc7103Binary; bootPkgs = packages.ghc7103Binary;