ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #326403 from chiroptical/chiroptical/erlang-27-0-1

Browse Source 
erlang: 25.3.2.12 -> 25.3.2.13; erlang_27: 27.0 -> 27.0.1
This commit is contained in:
Yt 2024-07-12 01:13:51 +00:00 committed by GitHub
commit 80e9e99a8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/erlang/25.nix
View File

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.3.2.12";
sha256 = "sha256-ZqyJtKr0QdzuuzKnJ/S6Z4cGLWolVMVWcMuAHyOGzkQ=";
version = "25.3.2.13";
sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc=";
}

4
pkgs/development/interpreters/erlang/27.nix
View File

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "27.0";
sha256 = "sha256-YZWBLcpkm8B4sjoQO7I9ywXcmxXL+Dvq/JYsLsr7TO0=";
version = "27.0.1";
sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ=";
}

12
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -122,20 +122,10 @@ stdenv.mkDerivation ({
'';
# 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
export EX_DOC=${exdoc}/bin/.ex_doc-wrapped
'';
configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]