diff options
author | Justin Wood <justin.k.wood@gmail.com> | 2017-07-11 14:16:48 -0400 |
---|---|---|
committer | Justin Wood <justin.k.wood@gmail.com> | 2017-07-11 14:16:48 -0400 |
commit | 0573610a5fbc82d54114f367bbf41b43798a1c0e (patch) | |
tree | f841abe8fce4830ef564cf010fc98833c1911155 /pkgs/development | |
parent | cb105d35a95f0667930782d2d377418671c12331 (diff) |
Make sure the LFE test suite is being run
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/beam-modules/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/interpreters/lfe/generic-builder.nix | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index b48abb34611cb..fa748da0031ce 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -55,7 +55,7 @@ let }; lfe = lfe_1_2; - lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3; }; + lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; # Non hex packages hex = callPackage ./hex {}; diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index c55872afbfb9d..9595337bd56c0 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3 }: +{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }: { baseName ? "lfe" , version @@ -7,13 +7,30 @@ , src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; } }: +let + proper = buildHex { + name = "proper"; + version = "1.1.1-beta"; + + sha256 = "0hnkhs761yjynw9382w8wm4j3x0r7lllzavaq2kh9n7qy3zc1rdx"; + + configurePhase = '' + ${erlang}/bin/escript write_compile_flags include/compile_flags.hrl + ''; + }; + +in + buildRebar3 { - name = "${baseName}"; + name = baseName; inherit src version; buildInputs = [ erlang makeWrapper ]; + beamDeps = [ proper ]; patches = [ ./no-test-deps.patch ]; + doCheck = true; + checkTarget = "travis"; # These installPhase tricks are based on Elixir's Makefile. # TODO: Make, upload, and apply a patch. |