swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303750 from chiroptical/add-erlang_27-rc2

Browse source 
erlang_27: init at 27-rc2
This commit is contained in:
Yt 2024-04-14 12:01:36 +00:00 committed by GitHub
parent 2a963398e3 92b656e044
commit 038cdc993a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/erlang/27-rc2.nix Normal file
View file

@ -0,0 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "27.0-rc2";
sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0=";
}

16
pkgs/development/interpreters/erlang/generic-builder.nix
View file

@ -18,9 +18,11 @@
, libGLU ? null
, wxGTK ? null
, xorg ? null
, exdoc ? null
, parallelBuild ? false
, systemd
, wxSupport ? true
, exdocSupport ? false
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd
# updateScript deps
, writeScript
@ -77,6 +79,7 @@ else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk11 != null;
assert exdocSupport -> exdoc != null;
let
inherit (lib) optional optionals optionalAttrs optionalString;
@ -114,8 +117,21 @@ stdenv.mkDerivation ({
${postPatch}
'';
# For OTP 27+ we need ex_doc to build the documentation
# When exdocSupport is enabled, grab the raw ex_doc executable from the exdoc
# derivation. Next, patch the first line to use the escript that will be
# built during the build phase of this derivation. Finally, building the
# documentation requires the erlang-logo.png asset.
preConfigure = ''
./otp_build autoconf
'' + optionalString exdocSupport ''
mkdir -p $out/bin
cp ${exdoc}/bin/.ex_doc-wrapped $out/bin/ex_doc
sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc
export EX_DOC=$out/bin/ex_doc
mkdir -p $out/lib/erlang/system/doc/assets
cp $src/system/doc/assets/erlang-logo.png $out/lib/erlang/system/doc/assets
'';
configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]

2
pkgs/top-level/all-packages.nix
View file

@ -17364,7 +17364,7 @@ with pkgs;
};
inherit (beam.interpreters)
erlang erlang_26 erlang_25 erlang_24
erlang erlang_27-rc2 erlang_26 erlang_25 erlang_24
erlang_odbc erlang_javac erlang_odbc_javac
elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
elixir-ls;

9
pkgs/top-level/beam-packages.nix
View file

@ -41,6 +41,15 @@ in
# Standard Erlang versions, using the generic builder.
erlang_27-rc2 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc2.nix {
wxGTK = wxGTK32;
parallelBuild = true;
autoconf = buildPackages.autoconf269;
exdocSupport = true;
exdoc = self.packages.erlang_26.ex_doc;
inherit wxSupport systemdSupport;
};
erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix {
wxGTK = wxGTK32;
parallelBuild = true;