diff options
author | Peter Simons <simons@cryp.to> | 2016-09-28 16:15:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-28 16:15:37 +0200 |
commit | 1fe5deb62b083ae32f6563780d85d2ffab3d2cc2 (patch) | |
tree | 08a1609524ae9c68262a1cd6a97f1a835ac50e08 /pkgs | |
parent | 347af0823ebf6ea0560da9a878ff0235d9d13a31 (diff) | |
parent | 308cd1abad5f922e4be2ae6eb7c6c4abe73ff981 (diff) | |
download | nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.tar nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.tar.gz nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.tar.bz2 nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.tar.lz nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.tar.xz nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.tar.zst nixpkgs-1fe5deb62b083ae32f6563780d85d2ffab3d2cc2.zip |
Merge pull request #19042 from Profpatsch/ghcjs-package-fixes
packages.ghcjs: fix a few packages
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 1feaa2a977b..5c7e42a59a7 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -122,4 +122,11 @@ self: super: ] drv.libraryHaskellDepends; }); + http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; + # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* + protolude = doJailbreak super.protolude; + semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; + # triggers an internal pattern match failure in haddock + # https://github.com/haskell/haddock/issues/553 + wai = dontHaddock super.wai; } |