diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/ghcjs-ng')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix | 7 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index c54c782fafa..bbf8a579919 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -1,11 +1,14 @@ { haskellLib }: -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); } diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix index 6d56c410aab..7b6fbc460a9 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix @@ -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]; } |