Skip to content

add erlang-21.0 #42329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LnL7 merged 1 commit into from
Jun 21, 2018
Merged

add erlang-21.0 #42329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/development/interpreters/erlang/R21.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{ mkDerivation, fetchurl }:

mkDerivation rec {
version = "21.0";
sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8";

prePatch = ''
substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10'
'';
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7175,7 +7175,7 @@ with pkgs;
beam = callPackage ./beam-packages.nix { };

inherit (beam.interpreters)
erlang erlangR18 erlangR19 erlangR20
erlang erlangR18 erlangR19 erlangR20 erlangR21
erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
lfe lfe_1_2;
Expand Down
10 changes: 10 additions & 0 deletions pkgs/top-level/beam-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ rec {
javacSupport = true; odbcSupport = true;
};
erlangR20_nox = erlangR20.override { wxSupport = false; };
erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
wxGTK = wxGTK30;
};
erlangR21_odbc = erlangR21.override { odbcSupport = true; };
erlangR21_javac = erlangR21.override { javacSupport = true; };
erlangR21_odbc_javac = erlangR21.override {
javacSupport = true; odbcSupport = true;
};
erlangR21_nox = erlangR21.override { wxSupport = false; };

# Basho fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
Expand Down Expand Up @@ -69,6 +78,7 @@ rec {
erlangR18 = packagesWith interpreters.erlangR18;
erlangR19 = packagesWith interpreters.erlangR19;
erlangR20 = packagesWith interpreters.erlangR20;
erlangR21 = packagesWith interpreters.erlangR21;

};
}