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

#84563 #95931 fix ghcjs 8.6 so it builds

Browse Source
This commit is contained in:
Dhruv Dang 2020-08-23 22:21:24 -07:00
parent 5f6fc2d834
commit 3369b35031
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,14 @@
{ haskellLib }:
{ lib, haskellLib, fetchFromGitHub }:
let inherit (haskellLib) doJailbreak dontHaddock;
let inherit (haskellLib) doJailbreak dontHaddock dontCheck;
in self: super: {
ghcjs = super.ghcjs.override {
shelly = super.shelly_1_8_1;
};
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 (dontCheck super.haddock-library-ghcjs);
haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs);
}

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

@ -102,7 +102,6 @@ in stdenv.mkDerivation {
inherit passthru;
meta.broken = true; # build does not succeed
meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms;
meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
meta.maintainers = [lib.maintainers.elvishjerricco];
}

8
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -94,4 +94,12 @@ self: super: {
# Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog
apply-refact = super.apply-refact_0_6_0_0;
# ghcjs 8.6.x relies on shelly < 1.9.0 (default is 1.9.0 in current package set, adding 1.8.1).
shelly_1_8_1 = super.callCabal2nix "shelly" (pkgs.fetchFromGitHub {
owner = "gregwebs";
repo = "Shelly.hs";
rev = "d0a185c7dee96820fc3652e7603d81a28276d76c";
sha256 = "173msjlq6yxpvd3900ajmd8znyg9kfg5csbxbiz4m7hvxkg8kbkn";
}) {};
}