Unverified Commit 47c75d98 authored by Yt's avatar Yt Committed by GitHub
Browse files

erlang: set latest version to OTP 28 (#449917)

parents 8616aec5 765df267

pkgs/development/beam-modules/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ let 


      lfe = callPackage ../interpreters/lfe { inherit erlang buildRebar3 buildHex; };



      livebook = callPackage ./livebook { };

      livebook = callPackage ./livebook { inherit beamPackages; };



      # Non hex packages. Examples how to build Rebar/Mix packages with and

      # without helper functions buildRebar3 and buildMix.

pkgs/development/interpreters/elixir/1.19.nix

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ mkDerivation { 
  sha256 = "sha256-RtJcnXjIqUw5h8Dsl8IPEaUVif4cHpUylmpmJCZ5EpM=";

  # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp

  minimumOTPVersion = "26";

  maximumOTPVersion = "28";

  escriptPath = "lib/elixir/scripts/generate_app.escript";

}

pkgs/top-level/all-packages.nix

+16 −6
Original line number Diff line number Diff line
@@ -1703,7 +1703,7 @@ with pkgs; 
  };



  plausible = callPackage ../by-name/pl/plausible/package.nix {

    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_18; });

    beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });

  };



  reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace { };
@@ -2749,6 +2749,10 @@ with pkgs; 


  fcitx5-table-other = callPackage ../tools/inputmethods/fcitx5/fcitx5-table-other.nix { };



  firezone-server = callPackage ../by-name/fi/firezone-server/package.nix {

    beamPackages = beam27Packages;

  };



  flannel = callPackage ../tools/networking/flannel { };

  cni-plugin-flannel = callPackage ../tools/networking/flannel/plugin.nix { };
@@ -5733,11 +5737,19 @@ with pkgs; 
    erlang_28

    erlang_27

    erlang_26

    elixir

    ;



  inherit (beam.packages.erlang_28.beamPackages)

    elixir_1_19

    ;



  inherit (beam.packages.erlang_27.beamPackages)

    elixir

    elixir_1_18

    elixir_1_17

    elixir-ls

    ex_doc

    lfe

    ;



  inherit (beam.packages.erlang_26.beamPackages)
@@ -5746,18 +5758,16 @@ with pkgs; 
    ;



  inherit (beam.packages.erlang)

    ex_doc

    erlfmt

    elvis-erlang

    rebar

    rebar3

    rebar3WithPlugins

    fetchHex

    lfe

    ;



  beamPackages = dontRecurseIntoAttrs beam27Packages;

  beamMinimalPackages = dontRecurseIntoAttrs beamMinimal27Packages;

  beamPackages = dontRecurseIntoAttrs beam.packages.erlang.beamPackages;

  beamMinimalPackages = dontRecurseIntoAttrs beam_minimal.packages.erlang.beamPackages;



  beam26Packages = recurseIntoAttrs beam.packages.erlang_26.beamPackages;

  beam27Packages = recurseIntoAttrs beam.packages.erlang_27.beamPackages;

pkgs/top-level/beam-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ in 
{

  beamLib = callPackage ../development/beam-modules/lib.nix { };



  latestVersion = "erlang_27";

  latestVersion = "erlang_28";



  # Each

  interpreters = {