diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-09-14 11:10:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-14 11:10:11 +0100 |
commit | 81b8f20732954c4508baf2f77472b5435e3f851f (patch) | |
tree | 4180177cb7ba85eab50159ce96218c2419fb24a6 /dev-lang/elixir | |
parent | 946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff) |
gentoo auto-resync : 14:09:2022 - 11:10:10
Diffstat (limited to 'dev-lang/elixir')
4 files changed, 0 insertions, 273 deletions
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest index dc4fde820524..76964df98c05 100644 --- a/dev-lang/elixir/Manifest +++ b/dev-lang/elixir/Manifest @@ -1,9 +1,6 @@ AUX elixir-1.10.3-epmd-daemon.patch 512 BLAKE2B c767cf4336214396d953efe568f0302d6852ec5332575202c167f38553deb9878b69d0744ed8a4062bbcb996df840f759f390ddc0c5e467aeab99250dee5a72e SHA512 dfe12ca0b47529a29d87871c9b31728099f816a0bd416512dd2409686fe6ceeb0e80e9da322ff38df27600da3235d174b365c80b8cae0e55eaee328b1260bc0d AUX elixir-1.10.3-no-Q.patch 355 BLAKE2B 903e5a7149f6e7f7030a533ae437b0e40b97c82c6baa7f90c1dff37fedf96c2e821e98529007e2300a92b8b3e9284428d91d6ee45888da7d79b18d35dfd89e58 SHA512 21d28b63fee2877337c0df095cfa200ae11ec2f0c76556e971957bb92e2b8e9d811c939b1efa458c633b61d3525f47a8b04d1b6f23df04e50ffb3ed5225f7c18 -AUX elixir-1.11.2-mksh.patch 2058 BLAKE2B 45e14921fc59f5707ee9bc2aaebea5f090a5995d07e1aa773d3751690230ded1abade17179f643e787ae3b53661c8ad7bafdf295fd1eb21d534c0b38a0083a1b SHA512 a888b73638873a5b7a6c5f2576c81d58e8df854e2ab3ecfbcf547da5aeea4eee0f43798a1c1308bc7f3515af2d28e78740c4016fde0f5e0eea2114dac7d98de6 AUX elixir-1.11.4-fix-elixir-test.patch 1170 BLAKE2B 05707d9d095f95d6d0fe3b21bd4078a933e3e2067596da5b1bc0a272d007abfe43317829d745c363a511a6b9e64a66727e92f64405a7ccbfb42aa0eae1a1a807 SHA512 2cef12a7339aab75368c24bb53764352bf6ad2275a51baef18e44e607f947cbd2829602587d849f9d6d7ad1c646f73db39d81bf331a38c95c259af8b483aece1 -AUX elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch 2355 BLAKE2B 4189a7f8189d595db3a194edbf54d448fbf13665d29a3ad6eb7a8c5909c17cd53958f5b675666f9219aff016dc0c6aa04f815e80ad7de919c05d5d515a82e717 SHA512 713af811385379982b35054301f4032fada4e27e63de7a8344323d36eee7b52bc519a73c61554c33ebba97b88b6abbc14daa65111ff53caec73b0c06c542230b -AUX elixir-1.11.4-update-warnings-for-OTP-master-10807.patch 5564 BLAKE2B a3e3a43c041df9842071beea4700f68fe4b2da0af4318711511e568599a31cd086544c8b2cb3b4a72232c1e26a8b2f29e97f80fa02e5c2a9de04c952c3c5fb92 SHA512 5c3f10588ad8c8f3bad92c500eb0db452ac2c72ac640674a0e6fecae6064ffd5a3d1cddea6e5bcb56d723043ce8586df4cb1538873f56854a5d05c70eebac12b AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc DIST elixir-1.12.3.tar.gz 2461828 BLAKE2B cdae9bd7f3463b89dd737ce943d57b7f9801bf382500a274332e1cb87902ecc37bd6e7a53af4dd5c1cd6e6d9d64171e226e676cd8023252c86fdf028d80dd383 SHA512 945e33ca9c3e50015531f87630c1bc1b9966acc64bbf7d01c8c4f8cfc104ee1e08113f572f0ad6a9f5e8ee37e33144e58b2ac33dc0a2b01e1355fc5f8b1b9329 DIST elixir-1.13.3.tar.gz 2922197 BLAKE2B 47c98ffe24d11ea161e9b9fa55d3c8ee1c2234848707aeeaf715eb02a61b7d3e8784bf2599b4129a824edf004d1edda2f0a42252710d957cc0213202f86dc06d SHA512 88bf585e18bfefa54c1c771247ec489bc96d16cc0f88384e9c0c981ddb665cd7efccd49383b4de1fbbd823ecd0a5e65d76e3065c9ce3c45f2f4feccd01ace48e diff --git a/dev-lang/elixir/files/elixir-1.11.2-mksh.patch b/dev-lang/elixir/files/elixir-1.11.2-mksh.patch deleted file mode 100644 index 3fda43156890..000000000000 --- a/dev-lang/elixir/files/elixir-1.11.2-mksh.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 69bb81635a77afb28419103bdb02867b48994d4a Mon Sep 17 00:00:00 2001 -From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> -Date: Wed, 9 Dec 2020 18:21:34 +0100 -Subject: [PATCH] bin/elixir: Rename erl() function to erl_set() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It conflicted with the erl executable for Korn-derived shells where a function -can be used in `exec command`. - -It isn't clear which behavior is expected from reading the POSIX specification -but "Shell Command Language § 2.9.1 Simple Commands" clears the usage of -the term `command` quite well. -And even with excluding functions from the `command` operand of `exec`, -why are aliases accepted? (in most if not all shells) - -See: https://bugs.gentoo.org/729964 ---- - bin/elixir | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - ---- a/bin/elixir -+++ b/bin/elixir -@@ -70,7 +70,7 @@ readlink_f () { - ERL="" - - # Stores erl arguments preserving spaces/quotes (mimics an array) --erl () { -+erl_set () { - eval "E${E}=\$1" - E=$((E + 1)) - } -@@ -137,34 +137,34 @@ while [ $I -le $LENGTH ]; do - ;; - --cookie) - S=2 -- erl "-setcookie" -- erl "$2" -+ erl_set "-setcookie" -+ erl_set "$2" - ;; - --sname|--name) - S=2 -- erl "$(echo "$1" | cut -c 2-)" -- erl "$2" -+ erl_set "$(echo "$1" | cut -c 2-)" -+ erl_set "$2" - ;; - --erl-config) - S=2 -- erl "-config" -- erl "$2" -+ erl_set "-config" -+ erl_set "$2" - ;; - --vm-args) - S=2 -- erl "-args_file" -- erl "$2" -+ erl_set "-args_file" -+ erl_set "$2" - ;; - --boot) - S=2 -- erl "-boot" -- erl "$2" -+ erl_set "-boot" -+ erl_set "$2" - ;; - --boot-var) - S=3 -- erl "-boot_var" -- erl "$2" -- erl "$3" -+ erl_set "-boot_var" -+ erl_set "$2" -+ erl_set "$3" - ;; - --pipe-to) - S=3 diff --git a/dev-lang/elixir/files/elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch b/dev-lang/elixir/files/elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch deleted file mode 100644 index 428e7ceb3ab4..000000000000 --- a/dev-lang/elixir/files/elixir-1.11.4-fix-logger-translator-with-otp-24-11222.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b1492cb0cfa689c4c098761a375d5cb728d3c175 Mon Sep 17 00:00:00 2001 -From: Matteo <mbrancaleoni@gmail.com> -Date: Tue, 31 Aug 2021 23:46:27 +0200 -Subject: [PATCH 3/3] Fix logger translator with otp-24 (#11222) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Handle new significant key in sasl reports - -* Add OTP-24.0 to CI matrix - -Co-authored-by: José Valim <jose.valim@dashbit.co> ---- - .github/workflows/ci.yml | 2 +- - lib/logger/lib/logger/translator.ex | 13 ++++++++++--- - 2 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml -index f43a9ff62..a4bc8dbeb 100644 ---- a/.github/workflows/ci.yml -+++ b/.github/workflows/ci.yml -@@ -15,7 +15,7 @@ jobs: - strategy: - fail-fast: false - matrix: -- otp_release: ['OTP-23.0', 'OTP-22.3', 'OTP-22.0', 'OTP-21.3.8', 'OTP-21.0'] -+ otp_release: ['OTP-24.0', 'OTP-23.0', 'OTP-22.3', 'OTP-22.0', 'OTP-21.3.8', 'OTP-21.0'] - development: [false] - include: - - otp_release: master -diff --git a/lib/logger/lib/logger/translator.ex b/lib/logger/lib/logger/translator.ex -index d1d7e62f1..8afd79436 100644 ---- a/lib/logger/lib/logger/translator.ex -+++ b/lib/logger/lib/logger/translator.ex -@@ -357,15 +357,22 @@ defp child_info(_min_level, _child) do - [] - end - -- defp child_debug(:debug, restart_type: restart, shutdown: shutdown, child_type: type) do -- ["\nRestart: ", inspect(restart), "\nShutdown: ", inspect(shutdown)] ++ -- ["\nType: ", inspect(type)] -+ defp child_debug(:debug, opts) do -+ for {key, value} <- opts do -+ child_debug_key(key, value) -+ end - end - - defp child_debug(_min_level, _child) do - [] - end - -+ defp child_debug_key(:restart_type, value), do: ["\nRestart: " | inspect(value)] -+ defp child_debug_key(:shutdown, value), do: ["\nShutdown: " | inspect(value)] -+ defp child_debug_key(:child_type, value), do: ["\nType: " | inspect(value)] -+ defp child_debug_key(:significant, value), do: if(value, do: "\nSignificant: true", else: []) -+ defp child_debug_key(_, _), do: [] -+ - defp report_crash(min_level, [[{:initial_call, initial_call} | crashed], linked]) do - mfa = initial_call_to_mfa(initial_call) - report_crash(min_level, crashed, [{:initial_call, mfa}], linked) --- -2.31.1 - diff --git a/dev-lang/elixir/files/elixir-1.11.4-update-warnings-for-OTP-master-10807.patch b/dev-lang/elixir/files/elixir-1.11.4-update-warnings-for-OTP-master-10807.patch deleted file mode 100644 index 2cc0b217cbb1..000000000000 --- a/dev-lang/elixir/files/elixir-1.11.4-update-warnings-for-OTP-master-10807.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 237a71311c5ae4fc5dd3c7a590a7b6dab97a664a Mon Sep 17 00:00:00 2001 -From: Wojtek Mach <wojtekmach@users.noreply.github.com> -Date: Tue, 23 Mar 2021 17:40:04 +0100 -Subject: [PATCH 2/3] Update warnings for OTP master (#10807) - ---- - lib/elixir/src/elixir_erl_compiler.erl | 34 ++++++++++++------- - .../test/elixir/kernel/warning_test.exs | 25 -------------- - 2 files changed, 21 insertions(+), 38 deletions(-) - -diff --git a/lib/elixir/src/elixir_erl_compiler.erl b/lib/elixir/src/elixir_erl_compiler.erl -index 7010b59fd..e0aa05114 100644 ---- a/lib/elixir/src/elixir_erl_compiler.erl -+++ b/lib/elixir/src/elixir_erl_compiler.erl -@@ -94,6 +94,8 @@ handle_file_warning(true, _File, {_Line, sys_core_fold, {nomatch_shadow, _}}) -> - - %% Those we implement ourselves - handle_file_warning(_, _File, {_Line, v3_core, {map_key_repeated, _}}) -> ok; -+handle_file_warning(_, _File, {_Line, sys_core_fold, {ignored, useless_building}}) -> ok; -+%% TODO: remove when we require Erlang/OTP 24 - handle_file_warning(_, _File, {_Line, sys_core_fold, useless_building}) -> ok; - - %% Ignore all linting errors (only come up on parse transforms) -@@ -112,11 +114,11 @@ handle_file_error(File, {Line, Module, Desc}) -> - elixir_errors:compile_error([{line, Line}], File, Message). - - %% Mention the capture operator in make_fun --custom_format(sys_core_fold, {no_effect, {erlang, make_fun, 3}}) -> -+custom_format(sys_core_fold, {ignored, {no_effect, {erlang, make_fun, 3}}}) -> - "the result of the capture operator & (:erlang.make_fun/3) is never used"; - - %% Make no_effect clauses pretty --custom_format(sys_core_fold, {no_effect, {erlang, F, A}}) -> -+custom_format(sys_core_fold, {ignored, {no_effect, {erlang, F, A}}}) -> - {Fmt, Args} = case erl_internal:comp_op(F, A) of - true -> {"use of operator ~ts has no effect", [elixir_utils:erlang_comparison_op_to_elixir(F)]}; - false -> -@@ -127,12 +129,20 @@ custom_format(sys_core_fold, {no_effect, {erlang, F, A}}) -> - end, - io_lib:format(Fmt, Args); - --%% Rewrite nomatch_guard to be more generic it can happen inside if, unless, and the like --custom_format(sys_core_fold, nomatch_guard) -> -+%% Rewrite nomatch to be more generic, it can happen inside if, unless, and the like -+custom_format(sys_core_fold, {nomatch, X}) when X == guard; X == no_clause -> - "this check/guard will always yield the same result"; - -+custom_format(sys_core_fold, {nomatch, {shadow, Line, {ErlName, ErlArity}}}) -> -+ {Name, Arity} = elixir_utils:erl_fa_to_elixir_fa(ErlName, ErlArity), -+ -+ io_lib:format( -+ "this clause for ~ts/~B cannot match because a previous clause at line ~B always matches", -+ [Name, Arity, Line] -+ ); -+ - %% Handle literal eval failures --custom_format(sys_core_fold, {eval_failure, {Mod, Name, Arity}, Error}) -> -+custom_format(sys_core_fold, {failed, {eval_failure, {Mod, Name, Arity}, Error}}) -> - #{'__struct__' := Struct} = 'Elixir.Exception':normalize(error, Error), - {ExMod, ExName, ExArgs} = elixir_rewrite:erl_to_ex(Mod, Name, lists:duplicate(Arity, nil)), - Call = 'Elixir.Exception':format_mfa(ExMod, ExName, length(ExArgs)), -@@ -143,18 +153,16 @@ custom_format(sys_core_fold, {eval_failure, {Mod, Name, Arity}, Error}) -> - ["the call to ", Trimmed, " will fail with ", elixir_aliases:inspect(Struct)]; - - %% TODO: remove when we require OTP 24 -+custom_format(sys_core_fold, {nomatch_shadow, Line, FA}) -> -+ custom_format(sys_core_fold, {nomatch, {shadow, Line, FA}}); -+custom_format(sys_core_fold, nomatch_guard) -> -+ custom_format(sys_core_fold, {nomatch, guard}); -+custom_format(sys_core_fold, {no_effect, X}) -> -+ custom_format(sys_core_fold, {ignored, {no_effect, X}}); - custom_format(sys_core_fold, {eval_failure, Error}) -> - #{'__struct__' := Struct} = 'Elixir.Exception':normalize(error, Error), - ["this expression will fail with ", elixir_aliases:inspect(Struct)]; - --custom_format(sys_core_fold, {nomatch_shadow,Line,{ErlName,ErlArity}}) -> -- {Name, Arity} = elixir_utils:erl_fa_to_elixir_fa(ErlName, ErlArity), -- -- io_lib:format( -- "this clause for ~ts/~B cannot match because a previous clause at line ~B always matches", -- [Name, Arity, Line] -- ); -- - custom_format([], Desc) -> - io_lib:format("~p", [Desc]); - -diff --git a/lib/elixir/test/elixir/kernel/warning_test.exs b/lib/elixir/test/elixir/kernel/warning_test.exs -index 15a984a54..37334ff65 100644 ---- a/lib/elixir/test/elixir/kernel/warning_test.exs -+++ b/lib/elixir/test/elixir/kernel/warning_test.exs -@@ -1154,31 +1154,6 @@ def foo(x), do: :ok - purge(Sample) - end - -- test "with and do clauses emit errors, else clauses do not" do -- assert capture_err(fn -> -- Code.compile_string(""" -- with {:first, int} when is_integer(int) <- {:second, Integer.gcd(2, 4)} do -- int -- end -- """) -- end) =~ "this clause cannot match" -- -- assert capture_err(fn -> -- Code.compile_string(""" -- with {:first, int1} when is_integer(int1) <- {:first, Integer.gcd(2, 4)}, -- {:second, int2} when is_integer(int2) <- {:second, Integer.gcd(2, 4)} do -- {:ok, int1 + int2} -- else -- {:first, nil} -> {:error, "first number is not integer"} -- {:second, nil} -> {:error, "second number is not integer"} -- end -- """) -- end) == "" -- after -- purge(Sample1) -- purge(Sample2) -- end -- - test "warning on code point escape" do - assert capture_err(fn -> - Code.eval_string("? ") --- -2.31.1 - |