From patchwork Fri Jun 21 19:01:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Goryachev X-Patchwork-Id: 65557 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 878C627BBEA; Fri, 21 Jun 2024 20:02:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1B70527BBE2 for ; Fri, 21 Jun 2024 20:02:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKjWV-0003iq-TR; Fri, 21 Jun 2024 15:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKjWN-0003hl-JN for guix-patches@gnu.org; Fri, 21 Jun 2024 15:02:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sKjWN-0007Ek-9T for guix-patches@gnu.org; Fri, 21 Jun 2024 15:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKjWM-00056e-Hn for guix-patches@gnu.org; Fri, 21 Jun 2024 15:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71707] [PATCH 01/15] gnu: elixir: Fix mix substitute. Resent-From: Igor Goryachev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 19:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71707@debbugs.gnu.org Cc: Igor Goryachev , Andrew Tropin Received: via spool by 71707-submit@debbugs.gnu.org id=B71707.171899651619555 (code B ref 71707); Fri, 21 Jun 2024 19:02:02 +0000 Received: (at 71707) by debbugs.gnu.org; 21 Jun 2024 19:01:56 +0000 Received: from localhost ([127.0.0.1]:43741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKjWF-000557-IN for submit@debbugs.gnu.org; Fri, 21 Jun 2024 15:01:56 -0400 Received: from mail.goryachev.org ([104.248.201.73]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKjWC-00054W-P5 for 71707@debbugs.gnu.org; Fri, 21 Jun 2024 15:01:53 -0400 Received: from localhost.localdomain (213-91-248-88.ip.btc-net.bg [213.91.248.88]) by mail.goryachev.org (Postfix) with ESMTPSA id 322B5120042; Fri, 21 Jun 2024 22:01:52 +0300 (MSK) Date: Fri, 21 Jun 2024 22:01:07 +0300 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=goryachev.org; s=dkim; t=1718996512; bh=X0U6b2I/qcVf9gIgNBGXXTEyYCrciShQuBvZbF+ewVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; b=Uf0zlh1RGYyJLCpdSz524Ixcbt9ij52uW4XsDsephpOUMA4dmR6BQ4hvN/cgB2vLY0WqzgBQAsvZ4wWQU0wthphV8ih2FHgLo+VU64So5h09A2CAQUzw4b5enoSmx/TLrfMJcKlleShQ9B5L8OnywqE3/rC4a4/2zQEAkdNBWlE= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Igor Goryachev X-ACL-Warn: , Igor Goryachev via Guix-patches X-Patchwork-Original-From: Igor Goryachev via Guix-patches via From: Igor Goryachev Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)