diff options
Diffstat (limited to 'pkgs/development/compilers/ghcjs/default.nix')
-rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index a73af47f9c4e..c15ebeca9fd0 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -36,31 +36,19 @@ , haddock, hspec, xhtml, primitive, cacert, pkgs , coreutils , libiconv + +, ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit; } +, shims ? import ./shims.nix { inherit fetchFromGitHub; } }: -let - version = "0.1.0"; - ghcjsBoot = fetchgit { - url = "git://github.com/ghcjs/ghcjs-boot.git"; - rev = "ec9f795b42b40fd24933d1672db153df5a29cc00"; # master branch - sha256 = "0bkvqlsgb9n0faayi4k1dlkn9cbm99a66m9nnx1kykb44qcl40yg"; - fetchSubmodules = true; - }; - shims = fetchFromGitHub { - owner = "ghcjs"; - repo = "shims"; - rev = "01e01dee31a4786b3d01092e72350b0859a9f8c9"; # master branch - sha256 = "01m1yhq6l71azx0zqbpzmqc6rxxf654hgjibc0lz2cg5942wh1hf"; - }; -in mkDerivation (rec { +let version = "0.1.0"; in +mkDerivation (rec { pname = "ghcjs"; inherit version; - # `src` is ghcjs's a3157072c2593debf2e45e751e9a8aa90b860b4d plus this - # additional dependency bump: https://github.com/ghcjs/ghcjs/pull/408 src = fetchFromGitHub { - owner = "k0001"; + owner = "ghcjs"; repo = "ghcjs"; - rev = "1b767e0b3dabdd1561bd17314d472651bfd9b97c"; - sha256 = "0j4vj47qljbcbrp3md3jwxwl2kz9k85visq6yi1x8wdch4wb2kgy"; + rev = "2ae1276a97c9f32c4b02080d1bb363cf0c2c553c"; + sha256 = "18m1737w4bfn84cnwcf021gsy69c84dlkwxnyf4r5h97gly6jx7q"; }; isLibrary = true; isExecutable = true; |