Message ID | cc8086621cbda47eb7ad139e7b779064520df1ed.1719903317.git.igor@goryachev.org |
---|---|
State | New |
Headers | show |
Series | [bug#71707,v4,01/15] gnu: elixir: Fix mix substitute. | expand |
On 2024-07-02 09:55, Igor Goryachev wrote: > * gnu/packages/elixir.scm (elixir): Fix mix substitute. > > Change-Id: I02d5849409dfbc624fcbe76b0a06b88e2ff8f4f2 > --- > gnu/packages/elixir.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm > index e3051a8275..ace067aa47 100644 > --- a/gnu/packages/elixir.scm > +++ b/gnu/packages/elixir.scm > @@ -136,7 +136,7 @@ (define-public elixir > ;; program, for example `iex -S mix`, so we should not wrap > ;; mix into shell script. > (substitute* (string-append out "/bin/mix") > - (("Mix.start\\(\\)") > + (("Mix.CLI.main\\(\\)") > (format #f "\ > ~~w[GUIX_ELIXIR_LIBS ERL_LIBS] > |> Enum.map(&System.get_env/1) > @@ -144,7 +144,7 @@ (define-public elixir > |> Enum.join(\":\") > |> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end > System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\")) > -Mix.start()" > +Mix.CLI.main()" > (search-input-file inputs "/bin/rebar3")))) > (for-each > (lambda (program) > > base-commit: 0f51ddd8dba6b69115d07f4a77ba70abb6521293 Hi Igor, Thank you for the fixes and updates, applied, pushed as https://git.savannah.gnu.org/cgit/guix.git/commit/?id=b3c8285127
diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index e3051a8275..ace067aa47 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -136,7 +136,7 @@ (define-public elixir ;; program, for example `iex -S mix`, so we should not wrap ;; mix into shell script. (substitute* (string-append out "/bin/mix") - (("Mix.start\\(\\)") + (("Mix.CLI.main\\(\\)") (format #f "\ ~~w[GUIX_ELIXIR_LIBS ERL_LIBS] |> Enum.map(&System.get_env/1) @@ -144,7 +144,7 @@ (define-public elixir |> Enum.join(\":\") |> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end System.put_env(\"MIX_REBAR3\", System.get_env(\"MIX_REBAR3\", \"~a\")) -Mix.start()" +Mix.CLI.main()" (search-input-file inputs "/bin/rebar3")))) (for-each (lambda (program)