diff options
| author | Daniel Goertzen <daniel.goertzen@gmail.com> | 2018-06-21 09:14:20 -0500 |
|---|---|---|
| committer | Daniel Goertzen <daniel.goertzen@gmail.com> | 2018-06-21 09:36:54 -0500 |
| commit | 4001a680cc9f644f3400c8a8aaddc703bd322935 (patch) | |
| tree | b4a478c0800562bbde645b06c0e7e4fca167e9d8 | |
| parent | f9218b1346a025d213dec6b838ef33864b3e3456 (diff) | |
| download | nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.tar nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.tar.gz nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.tar.bz2 nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.tar.lz nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.tar.xz nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.tar.zst nixlib-4001a680cc9f644f3400c8a8aaddc703bd322935.zip | |
erlangR21: init at 21.0
| -rw-r--r-- | pkgs/development/interpreters/erlang/R21.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/beam-packages.nix | 10 |
3 files changed, 21 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix new file mode 100644 index 000000000000..de00ebdf2cb0 --- /dev/null +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -0,0 +1,10 @@ +{ mkDerivation, fetchurl }: + +mkDerivation rec { + version = "21.0"; + sha256 = "0khprgawmbdpn9b8jw2kksmvs6b45mibpjralsc0ggxym1397vm8"; + + 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 f82853a751a3..effc40041345 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7175,7 +7175,7 @@ with pkgs; beam = callPackage ./beam-packages.nix { }; inherit (beam.interpreters) - erlang erlangR18 erlangR19 erlangR20 + erlang erlangR18 erlangR19 erlangR20 erlangR21 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 elixir elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3 lfe lfe_1_2; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 765f69c1b14a..8f8caf755edf 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -41,6 +41,15 @@ rec { javacSupport = true; odbcSupport = true; }; erlangR20_nox = erlangR20.override { wxSupport = false; }; + erlangR21 = lib.callErlang ../development/interpreters/erlang/R21.nix { + wxGTK = wxGTK30; + }; + erlangR21_odbc = erlangR21.override { odbcSupport = true; }; + erlangR21_javac = erlangR21.override { javacSupport = true; }; + erlangR21_odbc_javac = erlangR21.override { + javacSupport = true; odbcSupport = true; + }; + erlangR21_nox = erlangR21.override { wxSupport = false; }; # Basho fork, using custom builder. erlang_basho_R16B02 = lib.callErlang ../development/interpreters/erlang/R16B02-basho.nix { @@ -69,6 +78,7 @@ rec { erlangR18 = packagesWith interpreters.erlangR18; erlangR19 = packagesWith interpreters.erlangR19; erlangR20 = packagesWith interpreters.erlangR20; + erlangR21 = packagesWith interpreters.erlangR21; }; } |