public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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-24 10:35:39 -07:00
parent 5f6fc2d834
commit 3369b35031
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix
+6 -3
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);
}
pkgs/development/compilers/ghcjs-ng/default.nix
+1 -2
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];
}