Unverified Commit 5e39965a authored by Yt's avatar Yt Committed by GitHub
Browse files

erlang: update default to OTP 27 (#368120)

parents 0335a19e add22e4b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@

- The default PHP version has been updated to 8.3.

- The default Erlang OTP version has been updated to 27.

- `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default.
- A `nixos-rebuild build-image` sub-command has been added.

+2 −6
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ rebar3Relx {
  releaseType = "escript";
  beamDeps = builtins.attrValues deps;

  # https://github.com/erlang-ls/erlang_ls/issues/1429
  postPatch = ''
    rm apps/els_lsp/test/els_diagnostics_SUITE.erl
  '';

  buildPlugins = [ rebar3-proper ];
  buildPhase = "HOME=. make";
  # based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml
@@ -76,7 +71,7 @@ rebar3Relx {
  };
  passthru.updateScript = writeScript "update.sh" ''
    #!/usr/bin/env nix-shell
    #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"
    #! nix-shell -i bash -p common-updater-scripts coreutils git gnused gnutar gzip nixfmt-rfc-style "rebar3WithPlugins { globalPlugins = [ beamPackages.rebar3-nix ]; }"

    set -ox errexit
    latest=$(list-git-tags | sed -n '/[\d\.]\+/p' | sort -V | tail -1)
@@ -88,6 +83,7 @@ rebar3Relx {
      cp -R $(nix-build $nixpkgs --no-out-link -A erlang-ls.src)/* "$tmpdir"
      DEBUG=1
      (cd "$tmpdir" && HOME=. rebar3 as test nix lock -o "$nix_path/rebar-deps.nix")
      nixfmt "$nix_path/rebar-deps.nix"
    else
      echo "erlang-ls is already up-to-date"
    fi
+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

buildHex {
  name = "pc";
  version = "1.12.0";
  sha256 = "1gdvixy4j560qjdiv5qjgnl5wl3rrn231dv1m4vdq4b9l4g4p27x";
  version = "1.15.0";
  sha256 = "sha256-TA+tT2Q3yuNT1RfaIY/ng0e4/6RLmBeIdJTKquVFlbM=";

  meta = {
    description = "Rebar3 port compiler for native code";
+13 −2
Original line number Diff line number Diff line
@@ -4841,7 +4841,7 @@ with pkgs;
  pleroma = callPackage ../servers/pleroma {
    elixir = elixir_1_17;
    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; });
    beamPackages = beam.packages.erlang_26.extend (self: super: { elixir = elixir_1_17; });
  };
  plfit = callPackage ../by-name/pl/plfit/package.nix {
@@ -7181,10 +7181,13 @@ with pkgs;
  erlang_nox = beam_nox.interpreters.erlang;
  inherit (beam.packages.erlang)
    ex_doc erlang-ls erlfmt elvis-erlang
    ex_doc erlfmt elvis-erlang
    rebar rebar3 rebar3WithPlugins
    fetchHex
    lfe lfe_2_1;
  inherit (beam.packages.erlang_26) erlang-ls;
  beamPackages = beam.packages.erlang // { __attrsFailEvaluation = true; };
  erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };
@@ -18764,4 +18767,12 @@ with pkgs;
  clash-verge-rev = callPackage ../by-name/cl/clash-verge-rev/package.nix {
    libsoup = libsoup_3;
  };
  ejabberd = callPackage ../by-name/ej/ejabberd/package.nix {
    erlang = erlang_26;
  };
  wings = callPackage ../by-name/wi/wings/package.nix {
    erlang = erlang_25;
  };
}
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ in
{
  beamLib = callPackage ../development/beam-modules/lib.nix { };

  latestVersion = "erlang_25";
  latestVersion = "erlang_27";

  # Each
  interpreters = {