diff options
| author | Justin Wood <justin.k.wood@gmail.com> | 2017-06-26 23:12:39 -0400 |
|---|---|---|
| committer | Justin Wood <justin.k.wood@gmail.com> | 2017-06-26 23:51:18 -0400 |
| commit | cc09faa6fb3052da94066a3f95d317f5c720e054 (patch) | |
| tree | 3e405262a773374d7fa4500e634086ef4794fe79 | |
| parent | dc2f1569b30a61f43a2870867910ee21c8d8d5b2 (diff) | |
| download | nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.tar nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.tar.gz nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.tar.bz2 nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.tar.lz nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.tar.xz nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.tar.zst nixlib-cc09faa6fb3052da94066a3f95d317f5c720e054.zip | |
Remove additional OTP version information
| -rw-r--r-- | pkgs/development/beam-modules/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/beam-modules/lib.nix | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index ffafe88cc7f8..f0a049bb4b23 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -39,17 +39,17 @@ let # BEAM-based languages. 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; 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; 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; debugInfo = true; }; diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix index 43c1a3e45d52..da21cc17bf2f 100644 --- a/pkgs/development/beam-modules/lib.nix +++ b/pkgs/development/beam-modules/lib.nix @@ -47,7 +47,6 @@ rec { specific data. drv: package containing version-specific args; - vsn: minimum OTP version that Elixir will build on; builder: generic builder for all Erlang versions; args: arguments merged into version-specific args, used mostly to customize dependencies; @@ -57,7 +56,7 @@ rec { Please note that "mkDerivation" defined here is the one called from 1.4.nix and similar files. */ - callElixir = drv: vsn: args: + callElixir = drv: args: let inherit (stdenv.lib) versionAtLeast; builder = callPackage ../interpreters/elixir/generic-builder.nix args; |