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

erlang_27: init at 27-rc2

authored by Yt and committed by GitHub 038cdc99 2a963398

+32 -1
+6
pkgs/development/interpreters/erlang/27-rc2.nix
··· 1 + { mkDerivation }: 2 + 3 + mkDerivation { 4 + version = "27.0-rc2"; 5 + sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0="; 6 + }
+16
pkgs/development/interpreters/erlang/generic-builder.nix
··· 18 18 , libGLU ? null 19 19 , wxGTK ? null 20 20 , xorg ? null 21 + , exdoc ? null 21 22 , parallelBuild ? false 22 23 , systemd 23 24 , wxSupport ? true 25 + , exdocSupport ? false 24 26 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd 25 27 # updateScript deps 26 28 , writeScript ··· 77 79 78 80 assert odbcSupport -> unixODBC != null; 79 81 assert javacSupport -> openjdk11 != null; 82 + assert exdocSupport -> exdoc != null; 80 83 81 84 let 82 85 inherit (lib) optional optionals optionalAttrs optionalString; ··· 114 117 ${postPatch} 115 118 ''; 116 119 120 + # For OTP 27+ we need ex_doc to build the documentation 121 + # When exdocSupport is enabled, grab the raw ex_doc executable from the exdoc 122 + # derivation. Next, patch the first line to use the escript that will be 123 + # built during the build phase of this derivation. Finally, building the 124 + # documentation requires the erlang-logo.png asset. 117 125 preConfigure = '' 118 126 ./otp_build autoconf 127 + '' + optionalString exdocSupport '' 128 + mkdir -p $out/bin 129 + cp ${exdoc}/bin/.ex_doc-wrapped $out/bin/ex_doc 130 + sed -i "1 s:^.*$:#!$out/bin/escript:" $out/bin/ex_doc 131 + export EX_DOC=$out/bin/ex_doc 132 + 133 + mkdir -p $out/lib/erlang/system/doc/assets 134 + cp $src/system/doc/assets/erlang-logo.png $out/lib/erlang/system/doc/assets 119 135 ''; 120 136 121 137 configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]
+1 -1
pkgs/top-level/all-packages.nix
··· 17364 17364 }; 17365 17365 17366 17366 inherit (beam.interpreters) 17367 - erlang erlang_26 erlang_25 erlang_24 17367 + erlang erlang_27-rc2 erlang_26 erlang_25 erlang_24 17368 17368 erlang_odbc erlang_javac erlang_odbc_javac 17369 17369 elixir elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 17370 17370 elixir-ls;
+9
pkgs/top-level/beam-packages.nix
··· 41 41 42 42 # Standard Erlang versions, using the generic builder. 43 43 44 + erlang_27-rc2 = self.beamLib.callErlang ../development/interpreters/erlang/27-rc2.nix { 45 + wxGTK = wxGTK32; 46 + parallelBuild = true; 47 + autoconf = buildPackages.autoconf269; 48 + exdocSupport = true; 49 + exdoc = self.packages.erlang_26.ex_doc; 50 + inherit wxSupport systemdSupport; 51 + }; 52 + 44 53 erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix { 45 54 wxGTK = wxGTK32; 46 55 parallelBuild = true;