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

Remove additional OTP version information

Browse Source
This commit is contained in:
Justin Wood 2017-06-26 23:12:39 -04:00
parent dc2f1569b3
commit cc09faa6fb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,17 +39,17 @@ let
# BEAM-based languages. # BEAM-based languages.
elixir = elixir_1_4; elixir = elixir_1_4;
elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix "18" { elixir_1_5_rc = lib.callElixir ../interpreters/elixir/1.5.nix {
inherit rebar erlang; inherit rebar erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix "18" { elixir_1_4 = lib.callElixir ../interpreters/elixir/1.4.nix {
inherit rebar erlang; inherit rebar erlang;
debugInfo = true; debugInfo = true;
}; };
elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix "18" { elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
inherit rebar erlang; inherit rebar erlang;
debugInfo = true; debugInfo = true;
}; };

3
pkgs/development/beam-modules/lib.nix
View File

@ -47,7 +47,6 @@ rec {
specific data. specific data.
drv: package containing version-specific args; drv: package containing version-specific args;
vsn: minimum OTP version that Elixir will build on;
builder: generic builder for all Erlang versions; builder: generic builder for all Erlang versions;
args: arguments merged into version-specific args, used mostly to customize args: arguments merged into version-specific args, used mostly to customize
dependencies; dependencies;
@ -57,7 +56,7 @@ rec {
Please note that "mkDerivation" defined here is the one called from 1.4.nix Please note that "mkDerivation" defined here is the one called from 1.4.nix
and similar files. and similar files.
*/ */
callElixir = drv: vsn: args: callElixir = drv: args:
let let
inherit (stdenv.lib) versionAtLeast; inherit (stdenv.lib) versionAtLeast;
builder = callPackage ../interpreters/elixir/generic-builder.nix args; builder = callPackage ../interpreters/elixir/generic-builder.nix args;