summaryrefslogtreecommitdiffstats
path: root/pkgs/top-level/beam-packages.nix
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2017-09-20 22:56:06 +0800
committerPeter Hoeg <peter@hoeg.com>2017-09-22 09:54:45 +0800
commit51aa419354ab297e80a105a0b85ff3f4c378f05a (patch)
tree6264659390717cd24b662b1cc81537907287867e /pkgs/top-level/beam-packages.nix
parent743848bb46f8a9ae2d6e76dd4568a57025e4a799 (diff)
erlang: introduce "no X" variation
Diffstat (limited to 'pkgs/top-level/beam-packages.nix')
-rw-r--r--pkgs/top-level/beam-packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index fd2a55691712..bffd86da52e7 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -6,11 +6,12 @@ rec {
# Each
interpreters = rec {
- # R18 is the default version.
+ # R19 is the default version.
erlang = erlangR19; # The main switch to change default Erlang version.
erlang_odbc = erlangR19_odbc;
erlang_javac = erlangR19_javac;
erlang_odbc_javac = erlangR19_odbc_javac;
+ erlang_nox = erlangR19_nox;
# These are standard Erlang versions, using the generic builder.
erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};
@@ -21,6 +22,7 @@ rec {
erlangR17_odbc_javac = erlangR17.override {
javacSupport = true; odbcSupport = true;
};
+ erlangR17_nox = erlangR17.override { wxSupport = false; };
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
wxGTK = wxGTK30;
};
@@ -29,6 +31,7 @@ rec {
erlangR18_odbc_javac = erlangR18.override {
javacSupport = true; odbcSupport = true;
};
+ erlangR18_nox = erlangR18.override { wxSupport = false; };
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
wxGTK = wxGTK30;
};
@@ -37,6 +40,7 @@ rec {
erlangR19_odbc_javac = erlangR19.override {
javacSupport = true; odbcSupport = true;
};
+ erlangR19_nox = erlangR19.override { wxSupport = false; };
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
wxGTK = wxGTK30;
};
@@ -45,6 +49,7 @@ rec {
erlangR20_odbc_javac = erlangR20.override {
javacSupport = true; odbcSupport = true;
};
+ erlangR20_nox = erlangR20.override { wxSupport = false; };
# Bash fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {