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

Merge branch 'master' into improved-make-overridable

Browse Source
This commit is contained in:
Will Fancher
2017-08-26 11:39:13 -04:00
parent 05f9db601a 58dc4a8569
commit 4d860389d8
3457 changed files with 64462 additions and 45322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/beam-modules/default.nix
+4 -3
View File
@@ -32,9 +32,9 @@ let
buildMix = callPackage ./build-mix.nix {};
# BEAM-based languages.
elixir = elixir_1_4;
elixir = elixir_1_5;
elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang;
debugInfo = true;
};
@@ -49,7 +49,8 @@ let
debugInfo = true;
};
lfe = callPackage ../interpreters/lfe { };
lfe = lfe_1_2;
lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
# Non hex packages
hex = callPackage ./hex {};