Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-01-13 16:08:59 +01:00
79 changed files with 753 additions and 384 deletions
@@ -4,7 +4,7 @@ let
description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code.";
homepage = https://bucklescript.github.io;
license = licenses.lgpl3;
maintainers = with maintainers; [ turbomack gamb ];
maintainers = with maintainers; [ turbomack gamb anmonteiro ];
platforms = platforms.all;
};
in
+3 -3
View File
@@ -86,12 +86,12 @@ let
in
stdenv.mkDerivation (rec {
version = "8.10.0.20191210";
version = "8.10.0.20200108";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/8.10.1-alpha2/ghc-${version}-src.tar.xz";
sha256 = "1mmv8s9cs41kp7wh1qqnzin5wv32cvs3lmzgda7njz0ssqb0mmvj";
url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz";
sha256 = "1xm6cb3s2x3rycnyvkh12mp65xi3zbwrk5ima8sg7c245f3dl0ay";
};
enableParallelBuilding = true;