erlang_28: init at 28.0-rc1

This commit is contained in:
Adam C. Stephens
2025-02-16 19:56:18 -05:00
parent 849604f776
commit 7ffa9e92b5
5 changed files with 37 additions and 5 deletions

View File

@@ -1,4 +1,8 @@
{ lib, __splicedPackages, erlang }:
{
lib,
__splicedPackages,
erlang,
}:
let
pkgs = __splicedPackages;
@@ -7,10 +11,13 @@ let
lib' = pkgs.callPackage ./lib.nix { };
# FIXME: add support for overrideScope
callPackageWithScope = scope: drv: args: lib.callPackageWith scope drv args;
callPackageWithScope =
scope: drv: args:
lib.callPackageWith scope drv args;
mkScope = scope: pkgs // scope;
packages = self:
packages =
self:
let
defaultScope = mkScope self;
callPackage = drv: args: callPackageWithScope defaultScope drv args;
@@ -75,7 +82,6 @@ let
ex_doc = callPackage ./ex_doc {
inherit fetchMixDeps mixRelease;
elixir = elixir_1_17;
};
elixir-ls = callPackage ./elixir-ls { inherit elixir fetchMixDeps mixRelease; };

View File

@@ -0,0 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "28.0-rc1";
sha256 = "sha256-fjje31F5YW5rzetb2r4fkESwKt9N+WOH3yrqETUjJzg=";
}

View File

@@ -140,6 +140,13 @@ stdenv.mkDerivation (
libxml2
];
env = lib.optionalAttrs ((lib.versionAtLeast "28.0-rc1" version) && ex_docSupport) {
# erlang-28.0-rc> warning: jinterface.html redirects to ../lib/jinterface/doc/html/index.html, which does not exist
# erlang-28.0-rc>
# erlang-28.0-rc> warning: odbc.html redirects to ../lib/odbc/doc/html/index.html, which does not exist
EX_DOC_WARNINGS_AS_ERRORS = "false";
};
buildInputs =
[
ncurses

View File

@@ -6950,7 +6950,7 @@ with pkgs;
};
inherit (beam.interpreters)
erlang erlang_27 erlang_26 erlang_25
erlang erlang_28 erlang_27 erlang_26 erlang_25
elixir elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14
elixir-ls;
@@ -6968,10 +6968,14 @@ with pkgs;
beam25Packages = recurseIntoAttrs beam.packages.erlang_25;
beam26Packages = recurseIntoAttrs beam.packages.erlang_26;
beam27Packages = recurseIntoAttrs beam.packages.erlang_27;
# 28 is pre-release
beam28Packages = dontRecurseIntoAttrs beam.packages.erlang_28;
beamMinimal25Packages = recurseIntoAttrs beam_minimal.packages.erlang_25;
beamMinimal26Packages = recurseIntoAttrs beam_minimal.packages.erlang_26;
beamMinimal27Packages = recurseIntoAttrs beam_minimal.packages.erlang_27;
# 28 is pre-release
beamMinimal28Packages = dontRecurseIntoAttrs beam_minimal.packages.erlang_28;
erlang_language_platform = callPackage ../by-name/er/erlang-language-platform/package.nix { };

View File

@@ -31,6 +31,14 @@ in
#
# Three versions are supported according to https://github.com/erlang/otp/security
erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix {
wxGTK = wxGTK32;
parallelBuild = true;
# ex_doc failing to build with erlang 28
inherit (beam_nodocs.packages.erlang_27) ex_doc;
inherit ex_docSupport wxSupport systemdSupport;
};
erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix {
wxGTK = wxGTK32;
parallelBuild = true;
@@ -76,6 +84,7 @@ in
# appropriate Erlang/OTP version.
packages = {
erlang = self.packages.${self.latestVersion};
erlang_28 = self.packagesWith self.interpreters.erlang_28;
erlang_27 = self.packagesWith self.interpreters.erlang_27;
erlang_26 = self.packagesWith self.interpreters.erlang_26;
erlang_25 = self.packagesWith self.interpreters.erlang_25;