diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-14 14:04:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 14:04:38 +0000 |
| commit | 257e7bee5969c7be7501e173ecb3fdf90a7d71be (patch) | |
| tree | b5e24fecf3e3774edeb60ff799794a491566a7b1 /pkgs/development/interpreters | |
| parent | e996b2f54c43c27d5a4180f599c57104f2ed89a4 (diff) | |
| parent | 55b4d7d86fce40c1388e9d6051e43b92baddac98 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
4 files changed, 26 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index 5f94c27dbd4a4..441d12d747c59 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.10"; - sha256 = "sha256-CibLQnzQxvFDMNiX26n0b725o8BV4FJXBXmwW1sEpkk="; + version = "25.3.2.11"; + sha256 = "sha256-GeYDTgUcU//KjEw8jX/zR5OagHQLqpYLitn1PVmcIi0="; } diff --git a/pkgs/development/interpreters/erlang/27-rc2.nix b/pkgs/development/interpreters/erlang/27-rc2.nix new file mode 100644 index 0000000000000..a9b6fa05e5186 --- /dev/null +++ b/pkgs/development/interpreters/erlang/27-rc2.nix @@ -0,0 +1,6 @@ +{ mkDerivation }: + +mkDerivation { + version = "27.0-rc2"; + sha256 = "sha256-o+uqQMlrh7wJQbiecMnn3/tv6nqSJh7unOj0A95mMb0="; +} diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 6e9373b4a5636..32d1466f326e4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -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}" ] diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ad187c91e9f4e..4cc3f6f4e59eb 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -93,9 +93,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a5"; + suffix = "a6"; }; - hash = "sha256-Hom1NVGD58iYpaAbL2AXKP5J/bidnJeB8TNghHqu+mI="; + hash = "sha256-S+85PXKygaz4HTnXRV8AA26GYZPfohpO05cP0PTLoEg="; inherit (darwin) configd; inherit passthruFun; }; |