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

haskell.compiler.ghcjs86: Bump ghc-8.6 branch, fix build.

Browse Source
This commit is contained in:
Travis Whitaker 2019-09-17 15:16:11 -07:00 committed by Peter Simons
parent b5344ae807
commit 348656cea8
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
View File

@ -2,6 +2,10 @@
let inherit (haskellLib) doJailbreak dontHaddock; let inherit (haskellLib) doJailbreak dontHaddock;
in self: super: { in self: super: {
ghc-api-ghcjs = super.ghc-api-ghcjs.override
{
happy = self.happy_1_19_5;
};
haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs;
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
} }

4
pkgs/development/compilers/ghcjs-ng/8.6/git.json
View File

@ -1,6 +1,6 @@
{ {
"url": "https://github.com/ghcjs/ghcjs", "url": "https://github.com/ghcjs/ghcjs",
"rev": "75c61af32d73def4409d1fe7b64659c1d28cd075", "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874",
"sha256": "18pixn6xdz6qp941yhxfnmwi463jnpskmg473lv07vvgy4hpgjhj", "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy",
"fetchSubmodules": true "fetchSubmodules": true
} }

9
pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
View File

@ -59,20 +59,21 @@
}) {}; }) {};
ghc-api-ghcjs = callPackage ghc-api-ghcjs = callPackage
({ mkDerivation, array, base, binary, bytestring, containers ({ mkDerivation, alex, array, base, binary, bytestring, containers
, deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap
, ghci-ghcjs, hpc, process, stdenv, template-haskell-ghcjs , ghci-ghcjs, happy, hpc, process, stdenv, template-haskell-ghcjs
, terminfo, time, transformers, unix , terminfo, time, transformers, unix
}: }:
mkDerivation { mkDerivation {
pname = "ghc-api-ghcjs"; pname = "ghc-api-ghcjs";
version = "8.6.2"; version = "8.6.5";
src = configuredSrc + /lib/ghc-api-ghcjs; src = configuredSrc + /lib/ghc-api-ghcjs;
libraryHaskellDepends = [ libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath array base binary bytestring containers deepseq directory filepath
ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
template-haskell-ghcjs terminfo time transformers unix template-haskell-ghcjs terminfo time transformers unix
]; ];
libraryToolDepends = [ alex happy ];
homepage = "http://www.haskell.org/ghc/"; homepage = "http://www.haskell.org/ghc/";
description = "The GHC API (customized for GHCJS)"; description = "The GHC API (customized for GHCJS)";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
@ -107,7 +108,7 @@
base binary bytestring containers ghc-prim ghci-ghcjs base binary bytestring containers ghc-prim ghci-ghcjs
template-haskell-ghcjs template-haskell-ghcjs
]; ];
homepage = "https://github.com/ghcjs"; homepage = "http://github.com/ghcjs";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}) {}; }) {};

3
pkgs/development/compilers/ghcjs-ng/common-overrides.nix
View File

@ -1,8 +1,7 @@
{ haskellLib, alex, happy }: { haskellLib }:
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
in self: super: { in self: super: {
ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
system-fileio = doJailbreak super.system-fileio; system-fileio = doJailbreak super.system-fileio;

1
pkgs/development/compilers/ghcjs-ng/default.nix
View File

@ -34,7 +34,6 @@ let
(callPackage ./common-overrides.nix { (callPackage ./common-overrides.nix {
inherit haskellLib; inherit haskellLib;
inherit (bootPkgs) alex happy;
}) })
ghcjsDepOverrides ghcjsDepOverrides
]); ]);