diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
|---|---|---|
| committer | Will Fancher <elvishjerricco@gmail.com> | 2017-08-26 11:39:13 -0400 |
| commit | 4d860389d88d35a702f79c0567cb4c6b1ec0deda (patch) | |
| tree | 55ab20bfaf5e227ec2ff09317fcf74a11289c8bf /pkgs/development/beam-modules/default.nix | |
| parent | 05f9db601abd582be51f096affbb97eff49f2ccb (diff) | |
| parent | 58dc4a85691343a200c1c4495c1bd839b84c2824 (diff) | |
| download | nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.gz nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.bz2 nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.lz nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.xz nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.tar.zst nixpkgs-4d860389d88d35a702f79c0567cb4c6b1ec0deda.zip | |
Merge branch 'master' into improved-make-overridable
Diffstat (limited to 'pkgs/development/beam-modules/default.nix')
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 78ab61f73a4..74079e82ea1 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -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 {}; |