From 5da837ad9cd03b37b65e3bff36831d92d8420842 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Mon, 26 Mar 2018 01:01:58 -0400 Subject: [PATCH] GHCJS: Fix GHCJS with haddock-library-1.4.3 --- pkgs/development/compilers/ghcjs/head.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index f062a3db811..84eb2d8bd0d 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -47,6 +47,4 @@ bootPkgs.callPackage ./base.nix { stage2 = import ./head_stage2.nix; patches = [ ./ghcjs-head.patch ]; - - broken = true; # https://hydra.nixos.org/build/71923242 } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 4ea4a5c2846..7924a39fa96 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -74,6 +74,7 @@ self: super: { indents = dontCheck super.indents; # Newer versions require GHC 8.2. + haddock-library = self.haddock-library_1_4_3; haddock-api = self.haddock-api_2_17_4; haddock = self.haddock_2_17_5; }