diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-06-23 19:37:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 19:37:49 +0200 |
| commit | b0b5911fc14b90d279d54670dccf1484792f2ea0 (patch) | |
| tree | 2a73543156c5d8d6b2fe1855b125eee08cd8cd41 | |
| parent | cb0851d5fa27282f5be2969a85cad6ed5a389d38 (diff) | |
| parent | d79b4766a5b123ec078045d9945c805c489e053b (diff) | |
| download | nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.gz nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.bz2 nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.lz nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.xz nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.tar.zst nixlib-b0b5911fc14b90d279d54670dccf1484792f2ea0.zip | |
Merge pull request #26764 from mdaiter/erlangR20
erlangR20: init
| -rw-r--r-- | pkgs/development/interpreters/erlang/R20.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 8 |
3 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/erlang/R20.nix b/pkgs/development/interpreters/erlang/R20.nix new file mode 100644 index 000000000000..8866d9848e7a --- /dev/null +++ b/pkgs/development/interpreters/erlang/R20.nix @@ -0,0 +1,10 @@ +{ mkDerivation, fetchurl }: + +mkDerivation rec { + version = "20.0"; + sha256 = "12dbay254ivnakwknjn5h55wndb0a0wqx55p156h8hwjhykj2kn0"; + + prePatch = '' + substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2bd3d588329..1b7b80fb4d20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5995,7 +5995,8 @@ with pkgs; erlang_basho_R16B02 erlang_basho_R16B02_odbc erlangR17 erlangR17_odbc erlangR17_javac erlangR17_odbc_javac erlangR18 erlangR18_odbc erlangR18_javac erlangR18_odbc_javac - erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac; + erlangR19 erlangR19_odbc erlangR19_javac erlangR19_odbc_javac + erlangR20; inherit (beam.packages.erlang) rebar rebar3-open rebar3 diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 9e0234ac1e23..6b97c0d131bc 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -37,6 +37,14 @@ rec { erlangR19_odbc_javac = erlangR19.override { javacSupport = true; odbcSupport = true; }; + erlangR20 = lib.callErlang ../development/interpreters/erlang/R20.nix { + wxGTK = wxGTK30; + }; + erlangR20_odbc = erlangR20.override { odbcSupport = true; }; + erlangR20_javac = erlangR20.override { javacSupport = true; }; + erlangR20_odbc_javac = erlangR20.override { + javacSupport = true; odbcSupport = true; + }; # Bash fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-8-basho.nix { |