diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
| commit | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (patch) | |
| tree | d9ddecb505723c8c45ca2837e08e121f41b49fd2 /pkgs/development/compilers | |
| parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
| parent | de66fc6a2a2483f4bbbb759c55176643df6e38ba (diff) | |
| download | nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.gz nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.bz2 nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.lz nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.xz nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.tar.zst nixpkgs-ed1b0d0bac6438fbfcb2dca77493edcbe3384114.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/bs-platform/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.10.1.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 5eb11671ca9..59a47bdab70 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -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 diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 25226d4d0e6..b68e4802551 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -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; |