about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2018-11-22 13:02:52 +0100
committerGitHub <noreply@github.com>2018-11-22 13:02:52 +0100
commitd429dc3b065ed5bbae7f801a4ab3c9f7887eadff (patch)
tree60aeb094de451ec041a7d516b9b51723d43ea748 /pkgs/development/compilers
parentb25213cdb1a13f9c2c1e174ccebdcf28e23632fe (diff)
parent27b752347cc10203b77d1f389ef8f65603427dce (diff)
downloadnixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.tar
nixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.tar.gz
nixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.tar.bz2
nixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.tar.lz
nixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.tar.xz
nixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.tar.zst
nixlib-d429dc3b065ed5bbae7f801a4ab3c9f7887eadff.zip
Merge pull request #50879 from ElvishJerricco/bump-ghcjs-2018-11-21
Bump GHCJS 8.4
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/ghcjs-ng/8.4/git.json4
-rw-r--r--pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix1
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index b27c75bfe713..cfa6cf1d7d26 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "d20da90a4819faad1c6309a06363b34edac0374c",
-  "sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr",
+  "rev": "81bf5f31dabaa711aab234cb119eb9c998ccb129",
+  "sha256": "1bgnc71kjqicqv2xq8p70nck600yi2p7g4k9r1jclv21ib7i5hmx",
   "fetchSubmodules": true
 }
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
index 051b0a19b5b5..bf4fd6d68a7e 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
@@ -156,6 +156,7 @@
         tree-diff
       ];
       testToolDepends = [ hspec-discover ];
+      doHaddock = false;
       homepage = "http://www.haskell.org/haddock/";
       description = "Library exposing some functionality of Haddock";
       license = stdenv.lib.licenses.bsd3;