diff options
author | Justin Wood <me@ankhers.dev> | 2021-05-12 09:27:31 -0400 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-05-13 11:48:19 -0700 |
commit | 7500267ed9a32cd9799f616e811fa306ed70a950 (patch) | |
tree | 2aa725b260e336ec8d68038d090d52b08c02f648 | |
parent | 39167dd01410d7793eac642cc631f4a8bff5f3be (diff) |
ErlangR24: init at 24.0
Update configure options The configure script now needs to be told about the headers and the actual lib files separately. Remove extra whitespace
-rw-r--r-- | pkgs/development/interpreters/erlang/R24.nix | 8 | ||||
-rw-r--r-- | pkgs/development/interpreters/erlang/generic-builder.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/beam-packages.nix | 15 |
4 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix new file mode 100644 index 0000000000000..6808d0a849d36 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz +mkDerivation { + version = "24.0"; + sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w"; +} diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index c32a1b038e44f..aba4c318bea28 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -76,7 +76,8 @@ in stdenv.mkDerivation ({ ./otp_build autoconf ''; - configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ] + configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ] + ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24 ++ optional enableThreads "--enable-threads" ++ optional enableSmpSupport "--enable-smp-support" ++ optional enableKernelPoll "--enable-kernel-poll" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf82e86c9d40..6a3ba7dba12aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11874,7 +11874,7 @@ in beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; inherit (beam.interpreters) - erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 + erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02 elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_ls; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index ac9d4ab524e3a..dc338fc683ef8 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -14,6 +14,21 @@ rec { # Standard Erlang versions, using the generic builder. + # R24 + erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix { + wxGTK = wxGTK30; + # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508 + parallelBuild = true; + autoconf = buildPackages.autoconf269; + inherit wxSupport; + }; + erlangR24_odbc = erlangR24.override { odbcSupport = true; }; + erlangR24_javac = erlangR24.override { javacSupport = true; }; + erlangR24_odbc_javac = erlangR24.override { + javacSupport = true; + odbcSupport = true; + }; + # R23 erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix { wxGTK = wxGTK30; |