public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

erlang: use autoconf 2.69

Browse Source 
Each erlang package is given autoconf269 seperately so that when a new
version comes out that supports 2.70, it can use it and not be stuck
on the old version just because older erlangs need it.
This commit is contained in:
Alyssa Ross 2020-12-13 15:38:38 +00:00
parent 5397cbf79f
commit bee550014f
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ callPackage, wxGTK30, openssl_1_0_2 }: { callPackage, wxGTK30, openssl_1_0_2, autoconf269 }:
rec { rec {
lib = callPackage ../development/beam-modules/lib.nix {}; lib = callPackage ../development/beam-modules/lib.nix {};
@ -20,6 +20,7 @@ rec {
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;
autoconf = autoconf269;
}; };
erlangR23_odbc = erlangR23.override { odbcSupport = true; }; erlangR23_odbc = erlangR23.override { odbcSupport = true; };
erlangR23_javac = erlangR23.override { javacSupport = true; }; erlangR23_javac = erlangR23.override { javacSupport = true; };
@ -33,6 +34,7 @@ rec {
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;
autoconf = autoconf269;
}; };
erlangR22_odbc = erlangR22.override { odbcSupport = true; }; erlangR22_odbc = erlangR22.override { odbcSupport = true; };
erlangR22_javac = erlangR22.override { javacSupport = true; }; erlangR22_javac = erlangR22.override { javacSupport = true; };
@ -44,6 +46,7 @@ rec {
# R21 # R21
erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
autoconf = autoconf269;
}; };
erlangR21_odbc = erlangR21.override { odbcSupport = true; }; erlangR21_odbc = erlangR21.override { odbcSupport = true; };
erlangR21_javac = erlangR21.override { javacSupport = true; }; erlangR21_javac = erlangR21.override { javacSupport = true; };
@ -55,6 +58,7 @@ rec {
# R20 # R20
erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
autoconf = autoconf269;
}; };
erlangR20_odbc = erlangR20.override { odbcSupport = true; }; erlangR20_odbc = erlangR20.override { odbcSupport = true; };
erlangR20_javac = erlangR20.override { javacSupport = true; }; erlangR20_javac = erlangR20.override { javacSupport = true; };
@ -67,6 +71,7 @@ rec {
erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix { erlangR19 = lib.callErlang ../development/interpreters/erlang/R19.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
autoconf = autoconf269;
}; };
erlangR19_odbc = erlangR19.override { odbcSupport = true; }; erlangR19_odbc = erlangR19.override { odbcSupport = true; };
erlangR19_javac = erlangR19.override { javacSupport = true; }; erlangR19_javac = erlangR19.override { javacSupport = true; };
@ -79,6 +84,7 @@ rec {
erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix { erlangR18 = lib.callErlang ../development/interpreters/erlang/R18.nix {
wxGTK = wxGTK30; wxGTK = wxGTK30;
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
autoconf = autoconf269;
}; };
erlangR18_odbc = erlangR18.override { odbcSupport = true; }; erlangR18_odbc = erlangR18.override { odbcSupport = true; };
erlangR18_javac = erlangR18.override { javacSupport = true; }; erlangR18_javac = erlangR18.override { javacSupport = true; };
@ -89,6 +95,7 @@ rec {
# Basho fork, using custom builder. # Basho fork, using custom builder.
erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix {
autoconf = autoconf269;
}; };
erlang_basho_R16B02_odbc = erlang_basho_R16B02.override { erlang_basho_R16B02_odbc = erlang_basho_R16B02.override {
odbcSupport = true; odbcSupport = true;