Update ghcjs

pkgs/development/compilers/ghcjs/0.1.0.nix

@@ -14,18 +14,18 @@ cabal.mkDerivation (self: rec {
   version = "0.1.0";
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "c9ce6b9d87296b1236d5ef0f7d5236b2cedcff84";
-    sha256 = "0cla5bchprc8g5n39fkssnv3lj378h948irsnr7dslaki6laaagw";
+    rev = "c0b8ebb3e2608fdd8dc3b74b55f281b5c24be8e1";
+    sha256 = "442ebdfd426ec98a431735f72ec00c7dde54ae1f0c78dd593d33077ffdb1e2a2";
   };
   bootSrc = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "2daaf8fc0efd5b5906a7157a172ce77ca3b28d81";
-    sha256 = "0kwn3lh196rp02kz2vxd0mkqyix99xqzs4vsazv0s49ari0dc4w8";
+    rev = "8bf2861c0c776eec42e0a1833f220e36681e810c";
+    sha256 = "1f6695f7c25e40b87621ba6ce71a8338788951fd85e88e9223c8258520fbded6";
   };
   shims = fetchgit {
     url = git://github.com/ghcjs/shims.git;
-    rev = "a6dd0202dcdb86ad63201495b8b5d9763483eb35";
-    sha256 = "07cd7ijw4i62iz1xjpwilriiybpqdx246w8d3j27ny1xfsj9wnax";
+    rev = "5e11d33cb74f8522efca0ace8365c0dc994b10f6";
+    sha256 = "64be139022e6f662086103fca3838330006d38e6454bd3f7b66013031a47278e";
   };
   isLibrary = true;
   isExecutable = true;

pkgs/development/libraries/haskell/dependent-map/default.nix

@@ -7,6 +7,9 @@ cabal.mkDerivation (self: {
   version = "0.1.1.2";
   sha256 = "1g8mq8189c6wr1rik70019gqrnk84c613x9cn5383p7hhfyc0rnn";
   buildDepends = [ dependentSum ];
+  preConfigure = ''
+    sed -i 's/^.*ghc-options:.*$//' *.cabal
+  '';
   meta = {
     homepage = "https://github.com/mokus0/dependent-map";
     description = "Dependent finite maps (partial dependent products)";

pkgs/development/tools/haskell/Cabal-ghcjs/default.nix

@@ -5,11 +5,11 @@
 
 cabal.mkDerivation (self: {
   pname = "Cabal";
-  version = "9e87d6a3";
+  version = "b9c90bb4";
   src = fetchgit {
     url = git://github.com/ghcjs/cabal.git;
-    rev = "520591876ee57dbecba1b2de602dc79f4f67ecce"; # Must be from the ghcjs branch
-    sha256 = "f59182661707c65a2a014aa91b5e0d53cbefb6c999c1982757f476619b6728c0";
+    rev = "b9c90bb4d6fed8c2cc8323a7e24b67f821c1ee47"; # Must be from the ghcjs branch
+    sha256 = "d678d8c54d82db8b4fb0d7dc72c4832025c69586da8c0f65f6d05f6f50103c62";
   };
   preConfigure = "cd Cabal";
   configureFlags = "--program-suffix=-js";
@@ -24,6 +24,7 @@ cabal.mkDerivation (self: {
   # Cabal. Use the flag --package-db to specify a package database (it can be used
   # multiple times).
   doCheck = false;
+  noHaddock = true;
 
   buildDepends = [
     filepath HTTP mtl network random stm time zlib QuickCheck

pkgs/development/tools/haskell/cabal-install-ghcjs/default.nix

@@ -5,13 +5,14 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-install-ghcjs";
-  version = "9e87d6a3";
+  version = CabalGhcjs.version;
   src = CabalGhcjs.src;
   isLibrary = true;
   isExecutable = true;
   doCheck = false;
   configureFlags = "--program-suffix=-js";
   preConfigure = "cd cabal-install";
+  noHaddock = true;
   buildDepends = [
     CabalGhcjs filepath HTTP mtl network random stm time zlib
   ];

pkgs/development/tools/haskell/ghcjs/default.nix

@@ -27,17 +27,7 @@ cabal.mkDerivation (self: rec {
   isExecutable = true;
   jailbreak = true;
   noHaddock = true;
-  haddockInternal = cabal.mkDerivation (self: {
-    pname = "haddock-internal";
-    version = "2.14.3";
-    src = fetchgit {
-      url = git://github.com/ghcjs/haddock-internal.git;
-      rev = "47758773d6b20c395a1c76a93830070fde71dbab";
-      sha256 = "df1a024631b7781fcbda09d2b33a56650959b8ab6c831151b456133226ab90b2";
-    };
-    buildDepends = [ QuickCheck ghcPaths haddock hspec xhtml ]; # Can't specify Cabal here, or it ends up being the wrong version
-    doCheck = false;
-  });
+  doCheck = false;
   ghcjsPrim = cabal.mkDerivation (self: {
     pname = "ghcjs-prim";
     version = "0.1.0.0";
@@ -55,9 +45,9 @@ cabal.mkDerivation (self: rec {
     stringsearch syb systemFileio systemFilepath tar terminfo textBinary
     unorderedContainers vector wlPprintText yaml
     alex happy git gnumake gcc autoconf automake libtool patch gmp
-    base16Bytestring cryptohash executablePath haddockInternal
+    base16Bytestring cryptohash executablePath haddockApi
     transformersCompat QuickCheck haddock hspec xhtml
-    ghcjsPrim regexPosix haddockApi
+    ghcjsPrim regexPosix
   ];
   buildTools = [ nodejs git ];
   testDepends = [

pkgs/top-level/haskell-defaults.nix

@@ -249,6 +249,7 @@
               Cabal = packages_ghc783.CabalGhcjs;
             };
             transformersCompat = super.transformersCompat_0_3_3_3;
+            network = super.network_2_6_0_2;
             haddock = super.haddock.override {
               Cabal = null;
             };

pkgs/top-level/haskell-packages.nix

@@ -908,6 +908,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   ghcjs = callPackage ../development/tools/haskell/ghcjs {
     Cabal = self.Cabal_1_18_1_3;
+    network = self.network_2_6_0_2;
   };
 
   ghcjsDom = callPackage ../development/libraries/haskell/ghcjs-dom {};