From 0be225a8dcde25290d555a25e90f0e995170c2b9 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Sat, 16 Apr 2016 01:55:56 -0400 Subject: [PATCH] ghcjs: update sources to latest --- pkgs/development/compilers/ghcjs/default.nix | 8 ++++---- pkgs/development/compilers/ghcjs/shims.nix | 4 ++-- pkgs/development/haskell-modules/ghcjs/stage2.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index e18c3213a3c0..929d59a9a9bc 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -40,8 +40,8 @@ , ghcjsBootSrc ? fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f"; - sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j"; + rev = "758e79e420403e0f6625eda19b10c46564f7cbb5"; + sha256 = "0gq1mc86cb2z875a7sdj44yy8g95rwxzkl3z1q8gg33k05s3b58r"; fetchSubmodules = true; } , ghcjsBoot ? import ./ghcjs-boot.nix { @@ -60,8 +60,8 @@ in mkDerivation (rec { src = fetchFromGitHub { owner = "ghcjs"; repo = "ghcjs"; - rev = "13a99c6da40e3700e070e430d4c0f2ea96217b24"; - sha256 = "01yg6babmhn2bfbmgkddisfj9ai7fc4r08s6acd49s9amcw7g5ld"; + rev = "689c7753f50353dd05606ed79c51cd5a94d3922a"; + sha256 = "076020a9gjv8ldj5ckm43sbzq9s6c5xj6lpd8v28ybpiama3m6b4"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix index 2d68ea075515..0da50570bf59 100644 --- a/pkgs/development/compilers/ghcjs/shims.nix +++ b/pkgs/development/compilers/ghcjs/shims.nix @@ -2,6 +2,6 @@ fetchFromGitHub { owner = "ghcjs"; repo = "shims"; - rev = "4df1808d03117ddcd45f276f0ddd85c73e59506a"; - sha256 = "0nay4pmq3yqqvpz23709i3729840idpcc2ii2jd0xvaj1z61adda"; + rev = "dc034a035aa73db2c5be34145732090bd74c1b57"; + sha256 = "18r8kf7g7d2n0rhwcgiz9gsgdmgln1nmwwyj347bpn4zh17qlkqa"; } diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix index f84ddbdefa45..4b31e77ca7bd 100644 --- a/pkgs/development/haskell-modules/ghcjs/stage2.nix +++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix @@ -324,7 +324,7 @@ }: mkDerivation { pname = "Cabal"; - version = "1.22.4.0"; + version = "1.22.8.0"; src = "${ghcjsBoot}/boot/cabal/Cabal"; doCheck = false; libraryHaskellDepends = [