diff options
| author | Peter Simons <simons@cryp.to> | 2018-04-02 21:10:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-02 21:10:33 +0200 |
| commit | 5a6291f1a6bc5724981252638a590880a15f217b (patch) | |
| tree | 82739ec20ef342698a58961a50af92c80b6029cb | |
| parent | 2f0e2376ac45f8ee7724c35df5c72b11f9e03418 (diff) | |
| parent | 5da837ad9cd03b37b65e3bff36831d92d8420842 (diff) | |
| download | nixlib-5a6291f1a6bc5724981252638a590880a15f217b.tar nixlib-5a6291f1a6bc5724981252638a590880a15f217b.tar.gz nixlib-5a6291f1a6bc5724981252638a590880a15f217b.tar.bz2 nixlib-5a6291f1a6bc5724981252638a590880a15f217b.tar.lz nixlib-5a6291f1a6bc5724981252638a590880a15f217b.tar.xz nixlib-5a6291f1a6bc5724981252638a590880a15f217b.tar.zst nixlib-5a6291f1a6bc5724981252638a590880a15f217b.zip | |
Merge pull request #37842 from ElvishJerricco/fix-ghcjs-haddock-library-1.4.3
GHCJS: Fix GHCJS with haddock-library-1.4.3
| -rw-r--r-- | pkgs/development/compilers/ghcjs/head.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index f062a3db8118..84eb2d8bd0da 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 4ea4a5c28465..7924a39fa96d 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; } |