From patchwork Wed Feb 7 08:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 59874 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 07DA927BBE2; Wed, 7 Feb 2024 08:16:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 DF77227BBEA for ; Wed, 7 Feb 2024 08:16:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXd62-0006U2-NG; Wed, 07 Feb 2024 03:15:54 -0500 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 1rXd5y-0006RY-0C for guix-patches@gnu.org; Wed, 07 Feb 2024 03:15:52 -0500 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 1rXd5x-0005UH-Nu for guix-patches@gnu.org; Wed, 07 Feb 2024 03:15:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rXd6A-000053-3q for guix-patches@gnu.org; Wed, 07 Feb 2024 03:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68964] [PATCH v2] gnu: elixir: Remove wrap for mix. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Feb 2024 08:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68964 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68964@debbugs.gnu.org Cc: Pierre-Henry =?utf-8?b?RnLDtmhyaW5n?= , Ivan Sokolov , Liliana Marie Prikler , Andrew Tropin X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170729375632756 (code B ref -1); Wed, 07 Feb 2024 08:16:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Feb 2024 08:15:56 +0000 Received: from localhost ([127.0.0.1]:55656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXd64-0008WF-Dd for submit@debbugs.gnu.org; Wed, 07 Feb 2024 03:15:56 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXd5z-0008Vk-Tr for submit@debbugs.gnu.org; Wed, 07 Feb 2024 03:15:54 -0500 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 1rXd5U-0006QU-GM for guix-patches@gnu.org; Wed, 07 Feb 2024 03:15:27 -0500 Received: from out-177.mta1.migadu.com ([95.215.58.177]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rXd5P-0005M0-Ib for guix-patches@gnu.org; Wed, 07 Feb 2024 03:15:20 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=key1; t=1707293711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TOEHrZDnPe7P0BYAMOFhyu/tgqUm4uvV6axckTLssLs=; b=e9q6/RHGuJr3xHFbbTpah3x+kMZqmj1gaauaB5SHTbC02umXC3/NfR5SrRZFvZGQRQQhXU OScyANmVicQUsziFCdlwOkz1UdbDvKRzhCfkibJxdb2ZPKLdLW027Y4lGlEy7g8IV+adFj kLt9V3w9NTMnXtH8W1TBYnnuwf6iFdoL68unZUVd5vuC6DNk/F8BM8RBs5Pz3O2UebK6uo msg2SB0yMseMBLiZExM1xw7bkEi7TfD2VEvbdqCJQUr/7tBX2in0AdJTd4qzVOGGJC1LlD xjnwwope+TxSdWJaODGWzy/fqrouWbvzBLrvmBI0hAD0SLZ/xifZhdOoA8bFSQ== Date: Wed, 7 Feb 2024 11:13:06 +0300 Message-ID: In-Reply-To: <0be1b4f12499d6bf415b4c81971c21ad290cae07.1707287957.git.andrew@trop.in> References: <0be1b4f12499d6bf415b4c81971c21ad290cae07.1707287957.git.andrew@trop.in> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=95.215.58.177; envelope-from=andrew@trop.in; helo=out-177.mta1.migadu.com X-Spam_score_int: 3 X-Spam_score: 0.3 X-Spam_bar: / X-Spam_report: (0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_CHARSET_FARAWAY=2.45, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Andrew Tropin X-ACL-Warn: , Andrew Tropin via Guix-patches X-Patchwork-Original-From: Andrew Tropin via Guix-patches via From: Andrew Tropin 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)[#:phases]: Instead of wrapping mix into shell script, which sets environment variables, we patch mix itself and set environmnet variables via elixir code. Change-Id: Ia4643e18fe927491242a0541938b7570bd56fca1 Co-authored-by: Ivan Sokolov Change-Id: I29d2c61299a8a54125f0e15190c526a860d501da --- Changes since v1: Added Ivan's copyright and co-authored-by. gnu/packages/elixir.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) base-commit: cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index ef8c39d0d7..2d11707711 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -7,6 +7,8 @@ ;;; Copyright © 2018 Nikita ;;; Copyright © 2021 Oskar Köök ;;; Copyright © 2021 Cees de Groot +;;; Copyright © 2024 Andrew Tropin +;;; Copyright © 2024 Ivan Sokolov ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,7 +103,18 @@ (define-public elixir (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (programs '("elixir" "elixirc" "iex" "mix"))) + (programs '("elixir" "elixirc" "iex"))) + ;; mix can be sourced as an elixir script by other elixir + ;; program, for example `iex -S mix`, so we should not wrap + ;; mix into shell script. + (substitute* (string-append out "/bin/mix") + (("Mix.start\\(\\)") "\ +~w[GUIX_ELIXIR_LIBS ERL_LIBS] +|> Enum.map(&System.get_env/1) +|> Enum.reject(&is_nil/1) +|> Enum.join(\":\") +|> case do \"\" -> :ok; erl_libs -> System.put_env(\"ERL_LIBS\", erl_libs) end +Mix.start()")) (for-each (lambda (program) (wrap-program (string-append out "/bin/" program) '("ERL_LIBS" prefix ("${GUIX_ELIXIR_LIBS}"))))