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

Merge pull request #26804 from LnL7/erlangR19

Browse Source 
erlang: change default to R19
This commit is contained in:
Daiderd Jordan 2017-06-26 22:00:03 +02:00 committed by GitHub
commit 1389f28cd0
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6002,7 +6002,9 @@ with pkgs;
inherit (beam.packages.erlang) inherit (beam.packages.erlang)
rebar rebar3-open rebar3 rebar rebar3-open rebar3
hexRegistrySnapshot fetchHex beamPackages hexRegistrySnapshot fetchHex beamPackages
hex2nix cuter relxExe; hex2nix cuter;
inherit (beam.packages.erlangR18) relxExe;
groovy = callPackage ../development/interpreters/groovy { }; groovy = callPackage ../development/interpreters/groovy { };
@ -11472,7 +11474,9 @@ with pkgs;
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
yaws = callPackage ../servers/http/yaws { }; yaws = callPackage ../servers/http/yaws {
erlang = erlangR18;
};
zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {});
@ -16436,7 +16440,9 @@ with pkgs;
winswitch = callPackage ../tools/X11/winswitch { }; winswitch = callPackage ../tools/X11/winswitch { };
wings = callPackage ../applications/graphics/wings { }; wings = callPackage ../applications/graphics/wings {
erlang = erlangR18;
};
wireguard = callPackage ../os-specific/linux/wireguard { }; wireguard = callPackage ../os-specific/linux/wireguard { };

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

@ -7,10 +7,10 @@ rec {
interpreters = rec { interpreters = rec {
# R18 is the default version. # R18 is the default version.
erlang = erlangR18; # The main switch to change default Erlang version. erlang = erlangR19; # The main switch to change default Erlang version.
erlang_odbc = erlangR18_odbc; erlang_odbc = erlangR19_odbc;
erlang_javac = erlangR18_javac; erlang_javac = erlangR19_javac;
erlang_odbc_javac = erlangR18_odbc_javac; erlang_odbc_javac = erlangR19_odbc_javac;
# 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 {};