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

Make sure the LFE test suite is being run

Browse Source
This commit is contained in:
Justin Wood 2017-07-11 14:16:48 -04:00
parent cb105d35a9
commit 0573610a5f
No known key found for this signature in database
GPG Key ID: AD57C47E5F931181
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/beam-modules/default.nix
View File

@ -55,7 +55,7 @@ let
}; };
lfe = lfe_1_2; 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 # Non hex packages
hex = callPackage ./hex {}; hex = callPackage ./hex {};

21
pkgs/development/interpreters/lfe/generic-builder.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3 }: { stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, bash, buildRebar3, buildHex }:
{ baseName ? "lfe" { baseName ? "lfe"
, version , version
@ -7,13 +7,30 @@
, src ? fetchFromGitHub { inherit rev sha256; owner = "rvirding"; repo = "lfe"; } , 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 { buildRebar3 {
name = "${baseName}"; name = baseName;
inherit src version; inherit src version;
buildInputs = [ erlang makeWrapper ]; buildInputs = [ erlang makeWrapper ];
beamDeps = [ proper ];
patches = [ ./no-test-deps.patch ]; patches = [ ./no-test-deps.patch ];
doCheck = true;
checkTarget = "travis";
# These installPhase tricks are based on Elixir's Makefile. # These installPhase tricks are based on Elixir's Makefile.
# TODO: Make, upload, and apply a patch. # TODO: Make, upload, and apply a patch.