dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

erlang*: use matching openssl version for each release

Browse Source
This commit is contained in:
ajs124 2022-06-15 19:10:57 +02:00
parent 84f17a3082
commit e51d2c2715
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/beam-packages.nix
View File

@ -1,4 +1,5 @@
{ beam, callPackage, wxGTK30, buildPackages, stdenv { beam, callPackage, wxGTK30, buildPackages, stdenv
, openssl_1_1
, wxSupport ? true , wxSupport ? true
, systemdSupport ? stdenv.isLinux , systemdSupport ? stdenv.isLinux
}: }:
@ -51,6 +52,7 @@ with beam; {
# R23 # R23
erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {
openssl = openssl_1_1;
wxGTK = wxGTK30; wxGTK = wxGTK30;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true; parallelBuild = true;
@ -66,6 +68,7 @@ with beam; {
# R22 # R22
erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix { erlangR22 = lib.callErlang ../development/interpreters/erlang/R22.nix {
openssl = openssl_1_1;
wxGTK = wxGTK30; wxGTK = wxGTK30;
# Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508
parallelBuild = true; parallelBuild = true;
@ -81,6 +84,7 @@ with beam; {
# R21 # R21
erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
openssl = openssl_1_1;
wxGTK = wxGTK30; wxGTK = wxGTK30;
autoconf = buildPackages.autoconf269; autoconf = buildPackages.autoconf269;
inherit wxSupport systemdSupport; inherit wxSupport systemdSupport;