diff options
| author | David Waern <david.waern@gmail.com> | 2015-10-16 21:58:44 +0200 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2015-10-16 21:58:44 +0200 |
| commit | d1360231d1a963f1e01c2f43fb542b8d0098a6df (patch) | |
| tree | 3a83e008fcaa67d85e01cabdc01504b69e0c5b2f /pkgs/development/compilers/ghcjs | |
| parent | 620063af36ff12dd0bf54e0680ef653f0ba9f204 (diff) | |
| download | nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.tar nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.tar.gz nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.tar.bz2 nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.tar.lz nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.tar.xz nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.tar.zst nixpkgs-d1360231d1a963f1e01c2f43fb542b8d0098a6df.zip | |
ghcjs: make it easier to override shims and ghcjs-boot
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
| -rw-r--r-- | pkgs/development/compilers/ghcjs/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/ghcjs-boot.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghcjs/shims.nix | 7 |
3 files changed, 19 insertions, 15 deletions
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index ab1a0f521c6..8652c27e153 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -36,22 +36,12 @@ , 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 = "39cd58e12f02fa99f493387ba4c3708819a72294"; - sha256 = "0s7hvg60piklrg9ypa7r44l4qzvpinrgsaffak6fr7gd3k08wn9d"; - fetchSubmodules = true; - }; - shims = fetchFromGitHub { - owner = "ghcjs"; - repo = "shims"; - rev = "f17d10cf47450fe4e00433e988db0bddddb35cc0"; - sha256 = "1kgnkkz1khzkmb0dm0ssp8l17iy9d9n9phszcj6vg9vi7v9y7l05"; - }; -in mkDerivation (rec { +let version = "0.1.0"; in +mkDerivation (rec { pname = "ghcjs"; inherit version; src = fetchFromGitHub { diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix new file mode 100644 index 00000000000..9e5584a6ade --- /dev/null +++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix @@ -0,0 +1,7 @@ +{ fetchgit }: +fetchgit { + url = git://github.com/ghcjs/ghcjs-boot.git; + rev = "39cd58e12f02fa99f493387ba4c3708819a72294"; + sha256 = "0s7hvg60piklrg9ypa7r44l4qzvpinrgsaffak6fr7gd3k08wn9d"; + fetchSubmodules = true; +} diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix new file mode 100644 index 00000000000..512d1c8e9b3 --- /dev/null +++ b/pkgs/development/compilers/ghcjs/shims.nix @@ -0,0 +1,7 @@ +{ fetchFromGitHub }: +fetchFromGitHub { + owner = "ghcjs"; + repo = "shims"; + rev = "f17d10cf47450fe4e00433e988db0bddddb35cc0"; + sha256 = "1kgnkkz1khzkmb0dm0ssp8l17iy9d9n9phszcj6vg9vi7v9y7l05"; +} |