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

Merge pull request #29603 from peterhoeg/f/erlang

Browse Source 
erlang: introduce "no X" variation
This commit is contained in:
Peter Hoeg 2017-09-22 15:39:32 +08:00 committed by GitHub
commit bcd82d6b62
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -6295,7 +6295,7 @@ with pkgs;
inherit (beam.interpreters) inherit (beam.interpreters)
erlang erlangR17 erlangR18 erlangR19 erlangR20 erlang erlangR17 erlangR18 erlangR19 erlangR20
erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_5 elixir_1_4 elixir_1_3 elixir elixir_1_5 elixir_1_4 elixir_1_3
lfe lfe_1_2; lfe lfe_1_2;

7
pkgs/top-level/beam-packages.nix
View File

@ -6,11 +6,12 @@ rec {
# Each # Each
interpreters = rec { interpreters = rec {
# R18 is the default version. # R19 is the default version.
erlang = erlangR19; # The main switch to change default Erlang version. erlang = erlangR19; # The main switch to change default Erlang version.
erlang_odbc = erlangR19_odbc; erlang_odbc = erlangR19_odbc;
erlang_javac = erlangR19_javac; erlang_javac = erlangR19_javac;
erlang_odbc_javac = erlangR19_odbc_javac; erlang_odbc_javac = erlangR19_odbc_javac;
erlang_nox = erlangR19_nox;
# These are standard Erlang versions, using the generic builder. # These are standard Erlang versions, using the generic builder.
erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {}; erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};
@ -21,6 +22,7 @@ rec {
erlangR17_odbc_javac = erlangR17.override { erlangR17_odbc_javac = erlangR17.override {
javacSupport = true; odbcSupport = true; javacSupport = true; odbcSupport = true;
}; };
erlangR17_nox = erlangR17.override { wxSupport = false; };
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
@ -29,6 +31,7 @@ rec {
erlangR18_odbc_javac = erlangR18.override { erlangR18_odbc_javac = erlangR18.override {
javacSupport = true; odbcSupport = true; javacSupport = true; odbcSupport = true;
}; };
erlangR18_nox = erlangR18.override { wxSupport = false; };
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
@ -37,6 +40,7 @@ rec {
erlangR19_odbc_javac = erlangR19.override { erlangR19_odbc_javac = erlangR19.override {
javacSupport = true; odbcSupport = true; javacSupport = true; odbcSupport = true;
}; };
erlangR19_nox = erlangR19.override { wxSupport = false; };
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
}; };
@ -45,6 +49,7 @@ rec {
erlangR20_odbc_javac = erlangR20.override { erlangR20_odbc_javac = erlangR20.override {
javacSupport = true; odbcSupport = true; javacSupport = true; odbcSupport = true;
}; };
erlangR20_nox = erlangR20.override { wxSupport = false; };
# Bash fork, using custom builder. # Bash fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix {