public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10423 from waern/ghcjs-parameterise

Browse Source 
ghcjs: make it easier to override shims and ghcjs-boot
This commit is contained in:
Rickard Nilsson 2015-10-16 22:20:28 +02:00
commit 38fa633b3a
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/compilers/ghcjs/default.nix
View File

@ -36,22 +36,12 @@
, haddock, hspec, xhtml, primitive, cacert, pkgs , haddock, hspec, xhtml, primitive, cacert, pkgs
, coreutils , coreutils
, libiconv , libiconv
, ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit; }
, shims ? import ./shims.nix { inherit fetchFromGitHub; }
}: }:
let let version = "0.1.0"; in
version = "0.1.0"; mkDerivation (rec {
ghcjsBoot = fetchgit {
url = "git://github.com/ghcjs/ghcjs-boot.git";
rev = "39cd58e12f02fa99f493387ba4c3708819a72294";
sha256 = "0s7hvg60piklrg9ypa7r44l4qzvpinrgsaffak6fr7gd3k08wn9d";
fetchSubmodules = true;
};
shims = fetchFromGitHub {
owner = "ghcjs";
repo = "shims";
rev = "f17d10cf47450fe4e00433e988db0bddddb35cc0";
sha256 = "1kgnkkz1khzkmb0dm0ssp8l17iy9d9n9phszcj6vg9vi7v9y7l05";
};
in mkDerivation (rec {
pname = "ghcjs"; pname = "ghcjs";
inherit version; inherit version;
src = fetchFromGitHub { src = fetchFromGitHub {

7
pkgs/development/compilers/ghcjs/ghcjs-boot.nix Normal file
View File

@ -0,0 +1,7 @@
{ fetchgit }:
fetchgit {
url = git://github.com/ghcjs/ghcjs-boot.git;
rev = "39cd58e12f02fa99f493387ba4c3708819a72294";
sha256 = "0s7hvg60piklrg9ypa7r44l4qzvpinrgsaffak6fr7gd3k08wn9d";
fetchSubmodules = true;
}

7
pkgs/development/compilers/ghcjs/shims.nix Normal file
View File

@ -0,0 +1,7 @@
{ fetchFromGitHub }:
fetchFromGitHub {
owner = "ghcjs";
repo = "shims";
rev = "f17d10cf47450fe4e00433e988db0bddddb35cc0";
sha256 = "1kgnkkz1khzkmb0dm0ssp8l17iy9d9n9phszcj6vg9vi7v9y7l05";
}