diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92bfbdef2afd..1b8b222b94d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6002,7 +6002,9 @@ with pkgs; inherit (beam.packages.erlang) rebar rebar3-open rebar3 hexRegistrySnapshot fetchHex beamPackages - hex2nix cuter relxExe; + hex2nix cuter; + + inherit (beam.packages.erlangR18) relxExe; groovy = callPackage ../development/interpreters/groovy { }; @@ -11472,7 +11474,9 @@ with pkgs; 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 {}); @@ -16436,7 +16440,9 @@ with pkgs; winswitch = callPackage ../tools/X11/winswitch { }; - wings = callPackage ../applications/graphics/wings { }; + wings = callPackage ../applications/graphics/wings { + erlang = erlangR18; + }; wireguard = callPackage ../os-specific/linux/wireguard { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 46b0d12a5e91..acdbea673328 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -7,10 +7,10 @@ rec { interpreters = rec { # R18 is the default version. - erlang = erlangR18; # The main switch to change default Erlang version. - erlang_odbc = erlangR18_odbc; - erlang_javac = erlangR18_javac; - erlang_odbc_javac = erlangR18_odbc_javac; + erlang = erlangR19; # The main switch to change default Erlang version. + erlang_odbc = erlangR19_odbc; + erlang_javac = erlangR19_javac; + erlang_odbc_javac = erlangR19_odbc_javac; # These are standard Erlang versions, using the generic builder. erlangR16 = lib.callErlang ../development/interpreters/erlang/R16.nix {};